From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 30 Jul 2015 20:07:13 +0000 (+0200)
Subject: release.sh: tell git to prefer “next” when merging
X-Git-Tag: 4.11~71
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f87a78e1a96154596ac4054937d8a52679b905a8;p=i3%2Fi3

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

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