Post a plain two-merge conflict resolution instead of a git-merge-onto re-parent#61

Phlogistique wants to merge 2 commits into

claude/autorestack-rebase-merge-supportscortexio/autorestack-action:claude/autorestack-rebase-merge-supportfrom

claude/merge-onto-conflict-ux-ofnwrascortexio/autorestack-action:claude/merge-onto-conflict-ux-ofnwraCopy head branch name to clipboard