Add a change that will conflict

[korthout]

This change will be merged to a random branch: conflict-merge-target. When we attempt to backport to the branch conflict, it's expected to conflict.

[korthout]

/backport

[backport-action]

Backport failed for conflict, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin conflict
git worktree add -d .worktree/backport-371-to-conflict origin/conflict
cd .worktree/backport-371-to-conflict
git switch --create backport-371-to-conflict
git cherry-pick -x 3457521675d7e3df2d432d600a3375fef09332d0

[korthout]

Ok, this just ran korthout/backport-action#417, and this was the expected default result: on conflict the backport should fail.

Let's see what happens when we set "conflict_resolution": "draft_commit_conflicts".

[backport-action]

Created backport PR for conflict:

• [Backport conflict] Add a change that will conflict #372 with remaining conflicts!

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin conflict
git worktree add -d .worktree/backport-371-to-conflict origin/conflict
cd .worktree/backport-371-to-conflict
git switch backport-371-to-conflict
git reset --hard HEAD^
git cherry-pick -x 3457521675d7e3df2d432d600a3375fef09332d0
git push --force

[korthout]

It works!

[korthout]

/backport

[backport-action]

Git push to origin failed for conflict with exitcode 1

[backport-action]

Created backport PR for conflict:

• [Backport conflict] Add a change that will conflict #373 with remaining conflicts!

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin conflict
git worktree add -d .worktree/backport-371-to-conflict origin/conflict
cd .worktree/backport-371-to-conflict
git switch backport-371-to-conflict
git reset --hard HEAD^
git cherry-pick -x 3457521675d7e3df2d432d600a3375fef09332d0
git push --force-with-lease