Merge pull request #129 from tomjenkinson/JBTM-1298-master

JBTM-1281 rebase wizardry
jbosstm · Oct 24, 2012 · a5fa9b1 · a5fa9b1
2 parents e08c0ec + 95c8333
commit a5fa9b1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/scripts/hudson/narayana.sh b/scripts/hudson/narayana.sh
@@ -84,6 +84,14 @@ function build_as {
   fi
 
   git pull --rebase --ff-only upstream master
+  while [ $? != 0 ]
+  do
+     for i in `git status -s | sed "s/UU \(.*\)/\1/g"`
+     do 
+        awk '/^<+ HEAD$/,/^=+$/{next} /^>+ /{next} 1' $i > $i.bak; mv $i.bak $i; git add $i
+     done
+     git rebase --continue
+  done
   [ $? = 0 ] || fatal "git rebase failed"
 
   export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=512m"