Last active
June 28, 2018 10:58
-
-
Save anubhavsahoo/97c58ffed6248f7d918b93fca6ee260e to your computer and use it in GitHub Desktop.
git snippets and shortcuts
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
| #merge strategy for code that is partially merged | |
| git merge --no-commit -s recursive -X ours master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment