nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

release: disable git’s rename protection (prevented merging)

next
Michael Stapelberg 2018-03-10 18:52:27 +01:00
parent e6b2fefe26
commit 8513107f09
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release.sh
View File

@ -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