Skip to content

Instantly share code, notes, and snippets.

@tqheel

tqheel/gist:b4bac97b02cddbd140483448d12c461e

Created May 15, 2017 14:25
Show Gist options
  • Save tqheel/b4bac97b02cddbd140483448d12c461e to your computer and use it in GitHub Desktop.
Save tqheel/b4bac97b02cddbd140483448d12c461e to your computer and use it in GitHub Desktop.
Download ZIP
Merge branch b to branch a and resolve conflicts by taking all changes from branch b
Raw
gistfile1.txt
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