Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

JBTM-1281 rebase wizardry

  • Loading branch information...
commit 95c83338424f2413994c254b4c1eebbcbdd5ab1f 1 parent f7aa7f5
@tomjenkinson tomjenkinson authored
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"
Please sign in to comment.
Something went wrong with that request. Please try again.