feat(prompts): add task-aware conflict resolution to rebase-executor#47

HonestMajority merged 1 commit intomainHonestMajority/agman:mainfrom

rebase-with-taskHonestMajority/agman:rebase-with-taskCopy head branch name to clipboard