From 5bd9e8fbf8c536504b8521822bb63c1daaa8c158 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 12 Apr 2021 16:13:29 +0200
Subject: [PATCH] FIX #16699 TIME 0:15 fix sync
---
.gitlab-ci.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbb9750f14..b28ae1da10 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,9 +81,8 @@ commits:
- git config --global user.email "$CI_EMAIL" && git config --global user.name "$CI_USER"
- 'exists=`git show-ref refs/heads/$CI_COMMIT_REF_NAME` && if [ -n "$exists" ]; then git branch -D $CI_COMMIT_REF_NAME; fi'
- 'if [ -d ".git/rebase-apply" ]; then rm -fr .git/rebase-apply; fi'
- - git pull --rebase origin $CI_COMMIT_REF_NAME
- # Use this pull command if there are merge conflicts during rebase /!\ it will keep the changes in the Pro repository !
-# - git pull -s recursive -X theirs --no-edit origin $CI_COMMIT_REF_NAME
+# - git pull --rebase origin $CI_COMMIT_REF_NAME
+ - git pull -s recursive -X ours --no-edit origin $CI_COMMIT_REF_NAME
- git checkout -b $CI_COMMIT_REF_NAME
- git push origin --all
--
GitLab