antomor/check_merge_conflicts.sh

Created July 28, 2021 17:18

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

Download ZIP

Check merge conflicts

Raw

check_merge_conflicts.sh

	git merge --no-commit --no-ff <BRANCH-TO-MERGE>
	echo $?
	git merge --abort

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