Switched to a new branch '20241001105148.74182-1-thuth@redhat.com'
Applying: testing: bump mips64el cross to bookworm and allow to fail
Using index info to reconstruct a base tree...
M	.gitlab-ci.d/container-cross.yml
M	tests/docker/dockerfiles/debian-mips64el-cross.docker
M	tests/lcitool/refresh
Falling back to patching base and 3-way merge...
Auto-merging tests/lcitool/refresh
Auto-merging tests/docker/dockerfiles/debian-mips64el-cross.docker
CONFLICT (content): Merge conflict in tests/docker/dockerfiles/debian-mips64el-cross.docker
Auto-merging .gitlab-ci.d/container-cross.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 testing: bump mips64el cross to bookworm and allow to fail
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".