resolving conflict from base branch

[Borda]

Hello,
I would be interested in how are handled conflict if there is a collision between the cherry commit (from X branch) and target branch Y so it cannot be automatically placed on the newly created Z branch which is specifically created for the new PR, is there a way?

Thx 🐰

[Borda]

just thinking that this probably cannot be solved automatically as it would require user actions, but in such case (not to miss sync) create "empty PR" by linking the particular commit in the PR body

[dotennin]

Maybe we can add an input to let users merge manually in the autocreated PR or throw error direclly in the action.