From b6add64d14191909ed3d930e3da73b77abae71d0 Mon Sep 17 00:00:00 2001 From: Joey Kimsey Date: Mon, 12 Aug 2024 23:06:37 -0400 Subject: [PATCH] bugfix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}"