singularitti/git_merge.sh

Last active July 31, 2023 15:14

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

Download ZIP

Merging release into master with no resulting diff #Shell #Git

Raw

git_merge.sh

	# See https://stackoverflow.com/a/14307477/3260253
	git checkout main
	git pull --strategy=ours . release

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