feat(prompts): add task-aware conflict resolution to rebase-executor#47
Merged
HonestMajority merged 1 commit intomainfrom Feb 25, 2026
Merged
feat(prompts): add task-aware conflict resolution to rebase-executor#47HonestMajority merged 1 commit intomainfrom
HonestMajority merged 1 commit intomainfrom
Conversation
Insert a new step instructing the rebase-executor agent to review the # Current Task section before resolving conflicts, and enhance the conflict resolution guidance to prioritize task-central files. Both the embedded constant and user prompt file are updated in sync. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The rebase-executor agent already receives the task's TASK.md content in its prompt but wasn't instructed to use it during conflict resolution. This adds a new early step telling the agent to review the
# Current Tasksection to understand the branch goal, central files, and changes being made — then references that understanding in the conflict resolution guidance.# Current Taskto identify the goal, central files, and branch changesText-only prompt change — no Rust logic modified. Both the embedded
REBASE_EXECUTOR_PROMPTconstant insrc/config.rsand the user prompt file at~/.agman/prompts/rebase-executor.mdwere updated identically.