title: Resolve conflicts using remote changes when pulling from Git remote
body: <p>I'm trying to pull code from my GitHub repo onto my server, but the pull keeps failing because of merge conflicts. I don't want to keep any of the changes that may have occurred on my local server since the last pull.</p>
  
  <p>So is there a way I can force Git to overwrite with whatever version is in GitHub, rather than bother me about conflicts?</p>