Created
September 11, 2012 20:43
-
-
Save skyebook/3701879 to your computer and use it in GitHub Desktop.
Git merge with theirs strategy
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # 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