title: holding the commits and pulling a repository, and then pushing the commits
body: <p>I am a git-beginner, so apologies for the naive question: </p>
  
  <p>I am turning my local repo into a mess by doing the following:</p>
  
  <p>changing things and committing them but not pushing. Now the repository on the server has been changed by some other users. What I ideally want to do is to ignore all my commits, pull the last version from the server, and then commit my change and then push. Is there a way of doing this?</p>