[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1418-g0ea3a3e

[Michal Čihař]

The branch, master has been updated
       via  0ea3a3ea26ee065ee797bb14df5111cb4b335c6e (commit)
      from  08cda2f0763d257545c7588718b0e71743733dcb (commit)


- Log -----------------------------------------------------------------
commit 0ea3a3ea26ee065ee797bb14df5111cb4b335c6e
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Apr 7 09:30:53 2010 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 scripts/create-release.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 3fee3e1..859dbcf 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


hooks/post-receive
-- 
phpMyAdmin