release.sh: tell git to prefer “next” when merging

diff --git a/release.sh b/release.sh
index 4dd027779ed03541710a0e3e055f929d23b7d827..88bb54f5d3be090735e7ef3da5309039afacb4d8 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -74,12 +74,12 @@ if [ "${RELEASE_BRANCH}" = "master" ]; then
        git checkout master
        git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
        git checkout next
-       git merge --no-ff master -m "Merge branch 'master' into next"
+       git merge --no-ff -X ours master -m "Merge branch 'master' into next"
 else
        git checkout next
        git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
        git checkout master
-       git merge --no-ff next -m "Merge branch 'next' into master"
+       git merge --no-ff -X theirs next -m "Merge branch 'next' into master"
 fi
 
 git remote remove origin