X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=blobdiff_plain;f=release.sh;h=88bb54f5d3be090735e7ef3da5309039afacb4d8;hp=4dd027779ed03541710a0e3e055f929d23b7d827;hb=f87a78e1a96154596ac4054937d8a52679b905a8;hpb=3d16e48a4f994110984b31d54346e32d08382337

diff --git a/release.sh b/release.sh
index 4dd02777..88bb54f5 100755
--- 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