diff options
Diffstat (limited to 'ci')
-rw-r--r-- | ci/merge_i18n_update.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ci/merge_i18n_update.sh b/ci/merge_i18n_update.sh index 84d47ed2f..1943b27e4 100644 --- a/ci/merge_i18n_update.sh +++ b/ci/merge_i18n_update.sh @@ -3,6 +3,7 @@ git config --global user.name "CircleCI" git config --global user.email circleci@navit-project.org git rebase trunk git checkout trunk +git pull git merge --squash ${CIRCLE_BRANCH} git commit -m "${message}" git push |