title: Not sure about Git pull
body: <p>I'm still fairly new to Git, so please excuse my idiocy.</p>
  
  <p>I ran into an issue with pulling changes from the remote repository. I had previously done alot of changes to a particular file and a team member pushed some changes that wouldn't work at all. What confuses me is how would I prevent his changes from altering what I did? Is it as simple as undoing the last commit and going from there?</p>