diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d1eb08..0ea9c5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,7 @@ composer_update: script: - git ${JOB_GIT_FLAGS} fetch origin ${TARGET_BRANCH} - git ${JOB_GIT_FLAGS} checkout ${TARGET_BRANCH} + - git reset --hard origin/main - 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}"