Skip to content

Instantly share code, notes, and snippets.

@johnie

johnie/git fetch

Created September 16, 2013 07:27
Show Gist options
  • Save johnie/6577608 to your computer and use it in GitHub Desktop.
Save johnie/6577608 to your computer and use it in GitHub Desktop.
Download ZIP
Use this if you encounter pull conflicts.
Raw
git fetch
git fetch --all
git reset --hard origin/master
git fetch downloads the latest from remote without trying to merge or rebase anything.
Then the git reset resets the master branch to what you just fetched.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment