dhoer/macosx merge

Last active July 11, 2016 05:28

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

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

Download ZIP

Retain macosx build script (.travis.yml) during merge

Raw

macosx merge

	git merge --no-commit <merge-branch>
	git reset HEAD .travis.yml
	git checkout -- .travis.yml
	git commit -m 'merged <merge-branch>'

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