From f87a78e1a96154596ac4054937d8a52679b905a8 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Thu, 30 Jul 2015 22:07:13 +0200 Subject: [PATCH] =?utf8?q?release.sh:=20tell=20git=20to=20prefer=20?= =?utf8?q?=E2=80=9Cnext=E2=80=9D=20when=20merging?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.39.2