From e0a9e5065f4bb57968c0f18b46020741fc9fb9b0 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 12 Apr 2021 14:14:25 +0200
Subject: [PATCH] FIX #16699 TIME 0:15 fix stuck in rebase error in sync

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7858a6cfd..60fb83e79c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,6 +80,7 @@ commits:
    - git remote set-url origin $PRIVATE_REPOSITORY_URL_SSH
    - 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
    - git checkout -b $CI_COMMIT_REF_NAME
    - git push origin --all
-- 
GitLab