title: Two people working on a file at the same time in git
body: <blockquote>
    <p><strong>Possible Duplicate:</strong><br>
    <a href="https://stackoverflow.com/questions/4643998/how-git-works-when-two-peers-push-changes-to-same-remote-simultaneously">How git works when two peers push changes to same remote simultaneously</a>  </p>
  </blockquote>
  
  
  
  <p>I'm kinda new to git and me and a friend want to do some collaborative developing with git. I got the whole pull and push system down somewhat, now I have a question.</p>
  
  <p>I want to work on file <strong>test.php</strong> and I pull for new changes. Nothing. I edit it and want to push it, but in this time my friend edited and pushed it. What happens now? How are these conflicts solved?</p>
  
  <p>Thank you!</p>