From ee5bcd23fa5b6a9dd1efd57f49d89105b746dde3 Mon Sep 17 00:00:00 2001 From: Joey Kimsey Date: Mon, 12 Aug 2024 23:07:42 -0400 Subject: [PATCH] fix --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e6eb1e..96c790e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,7 @@ composer_update: script: - git ${JOB_GIT_FLAGS} fetch origin ${TARGET_BRANCH} - git ${JOB_GIT_FLAGS} checkout ${TARGET_BRANCH} + - git reset --hard - git pull --allow-unrelated-histories - export DATE_TIME="$(date '+%Y%m%d%H%M%S')" - export MR_BRANCH="${UPDATE_BRANCH_PREFIX}${DATE_TIME}"