feat(extract): enforce merge-point floor and remove --after-merge#455
Merged
feat(extract): enforce merge-point floor and remove --after-merge#455
Conversation
Remove the --after-merge flag from arb extract. Users now specify split points explicitly with --starting-with, which is clearer about what gets extracted. The first post-merge commit SHA is visible in arb status -v and arb log. Add merge-point floor validation: in repos where the branch has been merged into its base, split points below the merge point are rejected with a clear error. This closes an asymmetry where extract allowed grabbing pre-merge commits that the integrate/rebase path would never replay. Co-Authored-By: Claude Opus 4.6 (1M context) <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.
Remove the --after-merge flag from arb extract. Users now specify split
points explicitly with --starting-with, which is clearer about what gets
extracted. The first post-merge commit SHA is visible in arb status -v
and arb log.
Add merge-point floor validation: in repos where the branch has been
merged into its base, split points below the merge point are rejected
with a clear error. This closes an asymmetry where extract allowed
grabbing pre-merge commits that the integrate/rebase path would never
replay.
Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com