From 65a9ee0dbb9a93059d41fc8d085bcf9835299467 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Thu, 22 Oct 2015 13:41:31 +0200
Subject: [PATCH] Update release documentation

---
 RELEASE.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE.md b/RELEASE.md
index 898154ba4..4178191ed 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -65,11 +65,13 @@ For major releases: Create a new "support" branch:
     $ git checkout -b support/2.3
     $ git push -u origin support/2.3
 
-For minor releases: Push the support branch and cherry-pick the release commit into master:
+For minor releases: Push the support branch, cherry-pick the release commit
+into master and merge the support branch:
 
     $ git push -u origin support/2.3
     $ git checkout master
     $ git cherry-pick support/2.3
+    $ git merge --strategy=ours support/2.3
     $ git push origin master
 
 # External Dependencies