Browse files

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

JBTM-1281 rebase wizardry
  • Loading branch information...
2 parents e08c0ec + 95c8333 commit a5fa9b1398ce7ac45ae3037f62031ef4e3fedca2 @tomjenkinson tomjenkinson committed Oct 24, 2012
Showing with 8 additions and 0 deletions.
  1. +8 −0 scripts/hudson/narayana.sh
View
8 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"

0 comments on commit a5fa9b1

Please sign in to comment.