feat(fan-flames): add selective rejection for Pattern A using jj abandon#52
Merged
Conversation
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.
Summary
jj abandonremoves a failed task and auto-rebases descendants — one commandjj diffedit/jj splitfor partial file acceptance from a rejected taskjj revert(formerlybackout) for immutable history casesWhy
Pattern A (auto-chained) means all task content is baked into a linear chain. Previously the skill had no path for rejecting one task from the middle of a chain without losing downstream work. Research confirmed
jj abandonis the idiomatic answer — it rebases descendants automatically.Test plan
jj abandonon middle of a 3-commit chain rebases descendants correctlyjj log -r 'conflicts()'catches conflicts after selective rejection🤖 Generated with Claude Code