Permalink
Browse files

Merge branch 'master-JBTM-1281_-_Improve_Narayana.sh_to_auto-merge_wh…

…en_pulling' of git://github.com/paulrobinson/narayana into paulrobinson-master-JBTM-1281_-_Improve_Narayana.sh_to_auto-merge_when_pulling
  • Loading branch information...
paulrobinson committed Oct 4, 2012
2 parents 01a8e29 + f113648 commit d812b104c345fb4d79c26f61154a18cbcb0d15a4
Showing with 1 addition and 1 deletion.
  1. +1 −1 scripts/hudson/narayana.sh
@@ -81,7 +81,7 @@ function build_as {
git remote add upstream $UPSTREAM_GIT_URL
fi
- git pull --rebase --ff-only upstream master
+ git pull --rebase --ff-only -s ours upstream master
[ $? = 0 ] || fatal "git rebase failed"
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=512m"

0 comments on commit d812b10

Please sign in to comment.