On merge branches, classify adds/updates/deletes relative to target of merge#6151
Merged
On merge branches, classify adds/updates/deletes relative to target of merge#6151
Conversation
Contributor
|
Nice |
aryairani
approved these changes
Feb 12, 2026
aryairani
removed this pull request from the merge queue due to the queue being cleared
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.
Overview
Fixes #6026
This PR changes slurp to render adds/updates/deletes relative to the merge target, when on a merge branch, just like
updateandupgrade. Previously, everything was classified as an add, which made it more difficult than necessary to tell what's happening in a merge.Additionally, I found the slurp output of a merge that discards the other party's changes confusing (it just said "No changes"), so I changed the output while on a merge branch to include a reminder that
updatecommits the merge, andcancelcancels it.Test coverage
No new tests, but the existing
merge.mdtranscript demonstrates the changes.