Author: aduprat
Date: Tue Jan 26 16:18:21 2016
New Revision: 1726843
URL: http://svn.apache.org/viewvc?rev=1726843&view=rev
Log:
JAMES-1663 Prevent git error (Cannot update paths and switch to branch...) when
merging. Contributed by Duprat <antdup...@gmail.com>
Modified:
james/project/trunk/dockerfiles/merge/merge.sh
Modified: james/project/trunk/dockerfiles/merge/merge.sh
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/merge/merge.sh?rev=1726843&r1=1726842&r2=1726843&view=diff
==============================================================================
--- james/project/trunk/dockerfiles/merge/merge.sh (original)
+++ james/project/trunk/dockerfiles/merge/merge.sh Tue Jan 26 16:18:21 2016
@@ -23,7 +23,8 @@ git fetch apache
git checkout apache/trunk -b trunk
git fetch origin
-git checkout $SHA1 -b SHA1_BRANCH
+git checkout $SHA1
+git checkout -b SHA1_BRANCH
git checkout trunk
git checkout -b $RESULTING_BRANCH
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
