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

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

This commit is contained in:
Michael Stapelberg 2015-07-30 22:07:13 +02:00
parent 3d16e48a4f
commit f87a78e1a9
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

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