Last active
July 11, 2016 05:28
-
-
Save dhoer/8e3a7adef012a0ea0ab0bbc300dbe3d8 to your computer and use it in GitHub Desktop.
Retain macosx build script (.travis.yml) during merge
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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