Tested with:

• Running backport locally:
  Merge conflict => Fix locally before it is pushed & PR created
• Running backport via Github action:
  Merge conflict
  => Creates a PR for the branches that have no merge conflicts.
  => Merge conflict reported in the log
  => Merge conflicts are not reported on higher level, for examply failed/warning on GH action.

What I'm asking:
Can there maybe be a config option to force cherry-pick & push and let the merge conflict be handled by Github in the pull request?
For example:

• git cherry-pick commit_sha
• Merge conflict (ignore)
• git add .
• git cherry-pick continue\
• Optional: Add label "merge-conflict" to the PR

I would build a Github check on PR, to check for "<<<<<<< HEAD".
People can then checkout the PR branch, do some fixes, push and merge the PR.

Maybe mostly useful for the Github Action route, but still usefull in my opinion. Would you be open to a change like this?