diff options
| author | Michael Stapelberg <michael@stapelberg.de> | 2015-07-30 22:07:13 +0200 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2015-07-30 22:07:13 +0200 |
| commit | f87a78e1a96154596ac4054937d8a52679b905a8 (patch) | |
| tree | f3bdd7553f6061670fee8478c65f2895914dc15a /release.sh | |
| parent | 3d16e48a4f994110984b31d54346e32d08382337 (diff) | |
| download | i3-f87a78e1a96154596ac4054937d8a52679b905a8.tar.gz i3-f87a78e1a96154596ac4054937d8a52679b905a8.zip | |
release.sh: tell git to prefer “next” when merging
Diffstat (limited to 'release.sh')
| -rwxr-xr-x | release.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |