meta-openharmony migration: fetch job failed on repo sync with git push force

First repo cache sync is ok, but when retry and if there is a conflict in applying git patch the job failed.

$ if [ -n "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE" ] ; then REPO_MIRROR="$CI_ONIRO_RUNNER_PERSISTENT_STORAGE/meta-openharmony/repo-mirror" ; REPO_MIRROR_ARG="--reference=$REPO_MIRROR" ; mkdir -p $(dirname $REPO_MIRROR) ; exec 9>$REPO_MIRROR.lock ; flock 9 ; if [ -n "$REBUILD_REPO_MIRROR" ] ; then rm -rf "$REPO_MIRROR" ; fi ; if [ ! -e "$REPO_MIRROR" ] ; then echo "Creating new repo mirror @ $REPO_MIRROR" ; mkdir -p "$REPO_MIRROR" ; pushd "$REPO_MIRROR" ; repo init -u "$CI_PROJECT_DIR" -m "$MANIFEST_FILE" --mirror ; else echo "Reusing repo mirror @ $REPO_MIRROR" ; pushd "$REPO_MIRROR" ; repo init -u "$CI_PROJECT_DIR" -m "$MANIFEST_FILE" ; fi ; repo sync --no-clone-bundle ; popd ; fi
Reusing repo mirror @ /var/shared/meta-openharmony/repo-mirror
/var/shared/meta-openharmony/repo-mirror ~/eclipse/oniro-core/meta-openharmony
First, rewinding head to replay your work on top of it...
Applying: feat: Ef pipeline migration
project .repo/manifests/
.git/rebase-apply/patch:85: trailing whitespace.
    SOURCE_MIRROR_URL_CH: http://114.116.235.68/source-mirror    
.git/rebase-apply/patch:112: trailing whitespace.
    
.git/rebase-apply/patch:349: trailing whitespace.
      crane tag "$CI_EF_REGISTRY_IMAGE/$CONTAINER_NAME" "$CONTAINER_VERSION"    
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	.gitlab-ci.yml
M	.gitlab-ci/container.yml
Falling back to patching base and 3-way merge...
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
Recorded preimage for '.gitlab-ci.yml'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 feat: Ef pipeline migration
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
fatal: cannot create default in manifest

And as the cache is shared between all pipeline, any other pipeling trying to run failling

$ if [ -n "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE" ] ; then REPO_MIRROR="$CI_ONIRO_RUNNER_PERSISTENT_STORAGE/meta-openharmony/repo-mirror" ; REPO_MIRROR_ARG="--reference=$REPO_MIRROR" ; mkdir -p $(dirname $REPO_MIRROR) ; exec 9>$REPO_MIRROR.lock ; flock 9 ; if [ -n "$REBUILD_REPO_MIRROR" ] ; then rm -rf "$REPO_MIRROR" ; fi ; if [ ! -e "$REPO_MIRROR" ] ; then echo "Creating new repo mirror @ $REPO_MIRROR" ; mkdir -p "$REPO_MIRROR" ; pushd "$REPO_MIRROR" ; repo init -u "$CI_PROJECT_DIR" -m "$MANIFEST_FILE" --mirror ; else echo "Reusing repo mirror @ $REPO_MIRROR" ; pushd "$REPO_MIRROR" ; repo init -u "$CI_PROJECT_DIR" -m "$MANIFEST_FILE" ; fi ; repo sync --no-clone-bundle ; popd ; fi
Reusing repo mirror @ /var/shared/meta-openharmony/repo-mirror
/var/shared/meta-openharmony/repo-mirror ~/eclipse/oniro-core/meta-openharmony
error: .repo/manifests/: prior sync failed; rebase still in progress
fatal: cannot create default in manifest
Running after_script