rafaelvasco/git_merge_force

Created February 20, 2019 17:16

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

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

Download ZIP

[GIT] Merge branch , Ignore Local Changes

Raw

git_merge_force

	git checkout develop
	git merge -s ours master
	git checkout master
	git merge develop

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