Skip to content

Instantly share code, notes, and snippets.

@jordancalder

jordancalder/gist:561b0f6a721d7223f200

Created January 13, 2015 21:48
Show Gist options
  • Save jordancalder/561b0f6a721d7223f200 to your computer and use it in GitHub Desktop.
Save jordancalder/561b0f6a721d7223f200 to your computer and use it in GitHub Desktop.
Download ZIP
Git Overwrite Local Conflicts - Leave Other Local Changes Alone
Raw
gistfile1.txt
git add *
git commit -m "commit message"
//Fetch changes and overwrite local conflicts
git fetch origin master
git merge -s recursive -X theirs origin/master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment