feat: add intelligent conflict resolution to rebase skill#173
Open
andyhorn wants to merge 1 commit into
Open
Conversation
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>
ryzizub
reviewed
May 4, 2026
|
|
||
| Abort the rebase: | ||
| - Both sides added imports or list items — combine both sets, deduplicate, maintain sort order | ||
| - Generated files (`.g.dart`, `.freezed.dart`, `.gen.dart`, lock files) — take the current branch version; note that regeneration is needed after rebase completes |
Contributor
There was a problem hiding this comment.
These are Flutter-specific. We're trying to build a tech-agnostic plugin here, so I'd keep the generated files general without specifics.
ryzizub
reviewed
May 4, 2026
| Report how many commits ahead of the base branch: | ||
| Report success briefly: | ||
|
|
||
| - How many commits were replayed (`git rev-list --count origin/<base-branch>..HEAD`) |
Contributor
There was a problem hiding this comment.
Im not sure 100% it needs to be there but this might be added to allowed-tools, to not ask user for allow running this. This is safe command
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