Created
May 15, 2017 14:25
-
-
Save tqheel/b4bac97b02cddbd140483448d12c461e to your computer and use it in GitHub Desktop.
Merge branch b to branch a and resolve conflicts by taking all changes from branch b
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
| git merge -s recursive -X theirs B |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment