feat(commit-commands-jj): add ancestor check, post-merge cleanup, and absorbed change detection#55
Merged
Merged
Conversation
… absorbed change detection Add safety checks to /finish and /sync skills: - /finish Option 1: ancestor check warns about stacked changes before push - /finish Option 1: post-merge cleanup abandons local ancestors after squash-merge - /sync: detect absorbed changes after fetch, offer to abandon instead of conflicting rebase
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
/finishOption 1: Add ancestor check before push — warns if stacked changes will be included in the PR/finishOption 1: Add post-merge cleanup — abandons local ancestors after squash-merge so orphans don't accumulate/sync: Detect absorbed changes after fetch — offers to abandon changes already in trunk via squash-merge instead of forcing a conflicting rebaseTest plan
/finishwith a stacked change to verify ancestor warning/finishpost-merge to verify local cleanup/syncafter a squash-merge to verify absorbed change detection🤖 Generated with Claude Code