Created
December 13, 2016 15:44
-
-
Save justinvdm/7346c5bcc8ed910365218bd0ef5f9cc6 to your computer and use it in GitHub Desktop.
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
| diff --git a/utils/dev-release.sh b/utils/dev-release.sh | |
| index ba6ccb5..5e8bfc6 100755 | |
| --- a/utils/dev-release.sh | |
| +++ b/utils/dev-release.sh | |
| @@ -1,6 +1,6 @@ | |
| #!/bin/sh | |
| git checkout support/dev | |
| -git merge develop | |
| +git merge develop -X theirs | |
| ./utils/version.sh "$1" | |
| git tag "$1" | |
| git push origin support/dev |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment