omniosi/merge-strategies.txt

Created September 15, 2016 17:31

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

Select an option

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

Download ZIP

Merge Strategies to remember

Raw

merge-strategies.txt

	// overwrite the current branch with the current state of the master branch
	git merge -X theirs master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment