From 0ea3a3ea26ee065ee797bb14df5111cb4b335c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Wed, 7 Apr 2010 09:30:53 +0200
Subject: [PATCH] Use merge strategy that wil always prefer branch we're
 marking as STABLE/TESTING.

The problem is in fact that not all branches are merged together and it
usually causes conflicts on version string (documentation, config,
changelog,...). By simply using branch we're merging to STABLE/TESTING
we will get the correct merge.
---
 scripts/create-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 3fee3e11f..859dbcfb2 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -44,7 +44,7 @@ mark_as_release() {
     echo "* Marking release as $rel_branch"
     ensure_local_branch $rel_branch
     git checkout $rel_branch
-    git merge $branch
+    git merge -s recursive -X theirs $branch
 }
 
 # Read required parameters