From 9067605145b5029a2451f5b7581881a20e5ce445 Mon Sep 17 00:00:00 2001 From: Pierre Grandin Date: Sat, 10 Dec 2016 06:55:24 +0000 Subject: Fix:i18n:Ensure that we pull from trunk before rebasing --- ci/merge_i18n_update.sh | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.1