git_ui: Fix "resolve with agent" merge conflict notification#51290
Merged
danilo-leal merged 2 commits intomainfrom Mar 11, 2026
Merged
git_ui: Fix "resolve with agent" merge conflict notification#51290danilo-leal merged 2 commits intomainfrom
danilo-leal merged 2 commits intomainfrom
Conversation
Collaborator
|
/cherry-pick preview |
Contributor
|
🍒💥 Cherry-pick did not succeed |
JosephTLyons
pushed a commit
that referenced
this pull request
Mar 11, 2026
Follow up to #49807 This PR fixes the merge conflict notification by making it appear only once per a given set of conflicted paths, as opposed to showing every time the `ConflictsUpdated` or `StatusesChanged` even would fire. Release Notes: - N/A
tommyming
pushed a commit
to tommyming/zed
that referenced
this pull request
Mar 13, 2026
…ustries#51290) Follow up to zed-industries#49807 This PR fixes the merge conflict notification by making it appear only once per a given set of conflicted paths, as opposed to showing every time the `ConflictsUpdated` or `StatusesChanged` even would fire. Release Notes: - N/A
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
3 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.
Follow up to #49807
This PR fixes the merge conflict notification by making it appear only once per a given set of conflicted paths, as opposed to showing every time the
ConflictsUpdatedorStatusesChangedeven would fire.Release Notes: