anubhavsahoo/git-tips

Last active June 28, 2018 10:58

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/anubhavsahoo/97c58ffed6248f7d918b93fca6ee260e.js"></script>
Save anubhavsahoo/97c58ffed6248f7d918b93fca6ee260e to your computer and use it in GitHub Desktop.

Download ZIP

git snippets and shortcuts

Raw

	#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