try merging into master

1 files changed, 4 insertions, 1 deletions

diff --git a/all-update.sh b/all-update.sh
index 92f01d3..fce6de9 100755
--- a/all-update.sh
+++ b/all-update.sh
@@ -32,6 +32,7 @@ fi
 workspace="$PWD"/../..
 system="$1"
 strata=`grep "morph.*: *" "$system.morph" | cut -d: -f2-`
+branch=`git branch`
 
 if [ -z "$2" ]; then
   for stratum in $strata; do
@@ -53,9 +54,11 @@ for repo in $repos; do
     cd $workspace/*:$repo
     startpoint=`git rev-parse HEAD`
     echo merging master into $repo 
-    CMD=`git merge master > /dev/null 2>&1`
+    git checkout origin/master
+    git merge $branch
     if [ $? != "0" ]; then
          git reset --hard $startpoint
+         git checkout $branch
          echo $repo merge failed 
     else 
          echo $repo merge successful