title: git conflict when nobody else is working on branch
body: <p>I began encountering the following issue: I have forked a repository on gitHub and i'm working on a public branch that nobody else is working on and, from time to time, when i try to push things (git push origin [branchName]) i get the message that tells me that there is more work on the remote branch than on my machine and tells me to update. Then i update, but some the changes i made since the last push are reverted.</p>
  
  <p>Could please somebody tell me what is going on? </p>
  
  <p>P.S. i think this tends to happen after i make a pull request on gitHub and after that continue to push code on the same branch
  And also sometimes i see conflicts on the files that i continue to work</p>
  
  <p>Thanks for any help!</p>