title: Which is the best method to fix conflicts ? Rebase or Merge?
body: <p>Have a question regarding two scenarios: We are all working on a repo. Usually I’m working on my own folder, so everything I do is ok. But what if I’m working on a change in a file but the other developer work in the file at the same time?</p>
  
  <p>I checkout a local branch
  The other developer checkout another local branch
  The other developer commits, push, and merge the code into remote master
  I commits, push, and merge the code into remote master. But this will fail because the conflict
  What’s the best way to resolve it? Rebase or Merge conflict? How do we merge conflict from github website?</p>