noghte/merge-dev-and-master.sh

Created December 18, 2019 20:46

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/noghte/696f564af3da62f26db0dd31e6d5e296.js"></script>
Save noghte/696f564af3da62f26db0dd31e6d5e296 to your computer and use it in GitHub Desktop.

Download ZIP

Raw

merge-dev-and-master.sh

	git checkout dev
	git merge master
	git checkout master
	git merge --no-ff dev
	git checkout dev

Author

noghte commented Apr 3, 2020 •

edited

Loading

check conflicts:
grep -lr --exclude-dir=node_modules '<<<<<<<' .

accept one file from incoming or current:
git checkout --theirs PATH/FILE
git checkout --ours PATH/FILE

accept all incoming:
grep -lr --exclude-dir=node_modules '<<<<<<<' . | xargs git checkout --theirs

source: https://easyengine.io/tutorials/git/git-resolve-merge-conflicts/

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