Sure, I'll update it.

On 6 Jun 2013, at 09:36, tomjenkinson <notifications@github.com> wrote:

> In scripts/rebase-jbossas-branch.sh:
> 
> > @@ -22,15 +22,13 @@ git checkout -t origin/$ORIGIN_AS_BRANCH || fatal
> >  git remote add upstream $UPSTREAM_GIT_URL
> >  git pull --rebase --ff-only upstream $UPSTREAM_AS_BRANCH
> >  
> > -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"
> > +if [ $? != 0 ]; then
> > +  echo "Merge conflict needs manual intervention. Please go to '$TEMPORARY_REBASE_LOCATION/jboss-as' and resolve, then run:"
> > +  echo ""
> > +  echo "    git push origin $ORIGIN_AS_BRANCH -f"
> hmm, do we really want someone to blame us for a -f? Maybe paraphrase this rather than provide the actual command?
> 
> —
> Reply to this email directly or view it on GitHub.
> 

-- 
Paul Robinson
Web Service Transactions Lead
paul.robinson@redhat.com

JBoss, a Division of Red Hat
Registered in England and Wales under Company Registration No. 03798903
Directors: Michael Cunningham (USA), Brendan Lane (Ireland), Matt Parson
(USA), Charlie Peters (USA)