From 8513107f099ba4950bedfc72f4131177bc8bb2cd Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 10 Mar 2018 18:52:27 +0100 Subject: [PATCH] =?utf8?q?release:=20disable=20git=E2=80=99s=20rename=20pr?= =?utf8?q?otection=20(prevented=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 cfb4beae..fb017bb1 100755 --- a/release.sh +++ b/release.sh @@ -85,12 +85,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 -X ours master -m "Merge branch 'master' into next" + git merge --no-ff -s recursive -X ours -X no-renames 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 -X theirs next -m "Merge branch 'next' into master" + git merge --no-ff -s recursive -X theirs -X no-renames next -m "Merge branch 'next' into master" fi git remote remove origin -- 2.39.5