git: Use branch names for resolve conflict buttons #44421
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
cla-bot
bot
added
the
cla-signed
CherryWorm
pushed a commit
to CherryWorm/zed
that referenced
this pull request
Dec 16, 2025
) This makes merge conflict resolution clearer because we're now parsing the branch names from the conflict region instead of hardcoding HEAD and ORIGIN. ### Before <img width="1157" height="1308" alt="image" src="https://github.com/user-attachments/assets/1fd72823-4650-48dd-b26a-77c66d21614d" /> ### After <img width="1440" height="1249" alt="Screenshot 2025-12-08 at 2 17 12 PM" src="https://github.com/user-attachments/assets/d23c219a-6128-4e2d-a8bc-3f128aa55272" /> Release Notes: - git: Use branch names for git conflict buttons instead of HEAD and ORIGIN
someone13574
pushed a commit
to someone13574/zed
that referenced
this pull request
Dec 16, 2025
) This makes merge conflict resolution clearer because we're now parsing the branch names from the conflict region instead of hardcoding HEAD and ORIGIN. ### Before <img width="1157" height="1308" alt="image" src="https://github.com/user-attachments/assets/1fd72823-4650-48dd-b26a-77c66d21614d" /> ### After <img width="1440" height="1249" alt="Screenshot 2025-12-08 at 2 17 12 PM" src="https://github.com/user-attachments/assets/d23c219a-6128-4e2d-a8bc-3f128aa55272" /> Release Notes: - git: Use branch names for git conflict buttons instead of HEAD and ORIGIN
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This makes merge conflict resolution clearer because we're now parsing the branch names from the conflict region instead of hardcoding HEAD and ORIGIN.
Before
After
Release Notes: