feat: add intelligent conflict resolution to rebase skill#173
Open
andyhorn wants to merge 6 commits into
Open
Conversation
ryzizub
reviewed
May 4, 2026
ryzizub
reviewed
May 4, 2026
Contributor
|
@andyhorn can i ask you to rebase and address comments? thank you! ❤️ |
Replace the abort-on-conflict behavior with a step-by-step conflict resolution workflow: identify conflicted files, auto-resolve clear cases (imports, generated files, whitespace), ask the user on ambiguous logic changes, and report all resolutions. Add recovery step and explicit rules for safe rebase behavior. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
andyhorn
force-pushed
the
feat/rebase-skill-conflict-resolution
branch
from
369977f to
f20da58
Compare
Replace Dart-specific generated file extensions with a general description of generated and lock files. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Pre-approve the read-only git queries the rebase skill runs (rev-parse, rev-list, status, merge-base, diff) plus git add, so conflict resolution isn't interrupted by permission prompts for safe commands. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Grant the Read and Edit tools the conflict-resolution step needs to read and rewrite conflicted files, and add a GIT_EDITOR=true allowlist entry. Run `git rebase --continue` with GIT_EDITOR=true so a commit-message editor cannot hang the agent, and stop-and-report on non-conflict failures (e.g. a pre-commit hook) instead of looping. Generalize the post-resolution verify wording, rename "Step 5: Recovery" to a conditional "Recovery (if needed)" heading, and bump effort to medium. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Reword generated/lock-file resolution to resolve by content and warn that --ours/--theirs are reversed during a rebase, avoiding accidental loss of upstream changes. Require explicit user confirmation when one side modified code the other deleted, since auto-keeping resurrects a file the other side intentionally removed. Drop the redundant low-confidence bullet already covered by "When in doubt, ask." Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Suggest running the project's checks after a clean rebase too, since a clean rebase can still introduce semantic conflicts, and dedupe the stash-pop guidance by pointing the clean path at Step 4d. Generalize the verify wording away from a Dart/Flutter-flavored gate, add a rule to stage only resolved files (never git add -A), and rewrite the scope statement so it no longer contradicts the conflict-resolution edits. Co-Authored-By: Claude Opus 4.8 <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
2 participants
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.
Summary
git rebase --abort) as a safety net for bad statesTest plan
/rebaseon a branch with no conflicts completes cleanly and reports commit count/rebaseon a branch with auto-resolvable conflicts (import additions, whitespace) resolves without user intervention/rebaseon a branch with ambiguous logic conflicts stops and asks the user🤖 Generated with Claude Code