diff --git a/merge-to-win-ci b/merge-to-win-ci index 9b071ad29..113d2938b 100755 --- a/merge-to-win-ci +++ b/merge-to-win-ci @@ -1,6 +1,6 @@ #!/bin/bash git checkout master-win-ci || exit 1 -git merge --ff-only origin/master || exit 1 +git merge --commit -m 'update' origin/master || exit 1 git push origin master-win-ci || exit 1 git checkout master || exit 1