title: How do I push a commit without destroying teammate work?
body: <p>I'm new to Git and the problem I had today at my uni project is the following:</p>
  <ul>
  <li>I did some changes to certain files, commited and pushed to our GitHub repo.</li>
  <li>I told my teammate that I did the commit and he complained that now he can't commit his changes.</li>
  </ul>
  <p>I didn't realize that he was coding at the same time as me -- he says that if he pulls my commit then his changes to the same files would be lost.</p>
  <p>What do we do now, do I just tell him to copy those files to another place in his drive and then &quot;combine&quot; the changes? How do we avoid this situation in the future?</p>
  <p>Sorry for the poor wording and stuff, as I said I'm a beginner and very clueless about this topic.</p>