Anthony Eid 464d4f72eb git: Use branch names for resolve conflict buttons (#44421) ...

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

2025-12-08 14:49:06 -05:00

..

branch_diff.rs

adds tracing for instrumenting non-async functions (#44147)

2025-12-05 17:23:06 +00:00

conflict_set.rs

git: Use branch names for resolve conflict buttons (#44421)

2025-12-08 14:49:06 -05:00

git_traversal.rs

Automate settings registration (#42238)

2025-11-07 22:27:14 +00:00

pending_op.rs

Revert "git: Remove JobStatus from PendingOp in favour of in-flight p… (#42970)

2025-11-18 13:30:40 +00:00