diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-12-10 06:55:24 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-12-10 06:55:24 +0000 |
| commit | 9067605145b5029a2451f5b7581881a20e5ce445 (patch) | |
| tree | 5cc83efb80d9a7f8a03f97cef022f4192c6a71f1 | |
| parent | 6cc85d8923ebc39dbc6b65dbf6700fe6e50c2a06 (diff) | |
| download | navit-9067605145b5029a2451f5b7581881a20e5ce445.tar.gz | |
Fix:i18n:Ensure that we pull from trunk before rebasingR7142
| -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 |