title: Does git force you to pull changes to the tip? Does your push include those files?
body: <p>With Mercurial, if you try and push and there were commits made to the main repo, you are forced to pull and merge.</p>
  
  <p>The problem is, when you go to commit your changes, the changeset you push contains files that you were forced to merge.</p>
  
  <p>You didn't touch these files, yet the history shows you modifying them.</p>
  
  <p>Does git have this same behaviour?  Or is it smart enough to know you didn't modify those files so there is no point in having it your history.</p>