X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=release.sh;h=6e305464dc564e9e6ef34a3af3ebabb0a1c6fc8d;hb=5a20394092a65675c1e026cbaba04e6416bc25dc;hp=4dd027779ed03541710a0e3e055f929d23b7d827;hpb=e89f39158974e4d68491a8dcd471f6ee70f5b46f;p=i3%2Fi3

diff --git a/release.sh b/release.sh
index 4dd02777..6e305464 100755
--- a/release.sh
+++ b/release.sh
@@ -1,8 +1,8 @@
 #!/bin/zsh
 # This script is used to prepare a new release of i3.
 
-export RELEASE_VERSION="4.10.2"
-export PREVIOUS_VERSION="4.10.1"
+export RELEASE_VERSION="4.10.3"
+export PREVIOUS_VERSION="4.10.2"
 export RELEASE_BRANCH="master"
 
 if [ ! -e "../i3.github.io" ]
@@ -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
@@ -98,6 +98,7 @@ mkdir debian
 # Copy over the changelog because we expect it to be locally modified in the
 # start directory.
 cp "${STARTDIR}/debian/changelog" i3/debian/changelog
+(cd i3 && git add debian/changelog && git commit -m 'Update debian/changelog')
 
 cat > ${TMPDIR}/Dockerfile <<EOT
 FROM debian:sid