Skip to content

Instantly share code, notes, and snippets.

@skyebook

skyebook/gist:3701879

Created September 11, 2012 20:43
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save skyebook/3701879 to your computer and use it in GitHub Desktop.
Save skyebook/3701879 to your computer and use it in GitHub Desktop.
Download ZIP
Git merge with theirs strategy
Raw
gistfile1.sh
# Use the 'theirs' strategy option during a git merge
git merge -Xtheirs original/master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment