diff options
| -rwxr-xr-x | pmwg-ci-integ | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pmwg-ci-integ b/pmwg-ci-integ index e2130eb..ef4b273 100755 --- a/pmwg-ci-integ +++ b/pmwg-ci-integ @@ -319,7 +319,7 @@ while read LINE; do echo "Merging $REMOTE_NAME/$REMOTE_BRANCH" - git merge --no-edit $REMOTE_NAME/$REMOTE_BRANCH + git merge --no-ff --no-edit $REMOTE_NAME/$REMOTE_BRANCH if [ $? -ne 0 ]; then echo "Merge failed, manual merge" xterm -e "git mergetool -y" |