diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae6bae5..2e6eb1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ composer_update: script: - git ${JOB_GIT_FLAGS} fetch origin ${TARGET_BRANCH} - git ${JOB_GIT_FLAGS} checkout ${TARGET_BRANCH} - - git pull + - git pull --allow-unrelated-histories - export DATE_TIME="$(date '+%Y%m%d%H%M%S')" - export MR_BRANCH="${UPDATE_BRANCH_PREFIX}${DATE_TIME}" - git ${JOB_GIT_FLAGS} checkout -b "${MR_BRANCH}"