Danilo Leal 3c82ddf261 git_ui: Fix "resolve with agent" merge conflict notification (#51290) ...

Follow up to https://github.com/zed-industries/zed/pull/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

2026-03-11 11:35:59 -03:00

..

askpass_modal.rs

windows: Encrypt SSH passwords stored in memory (#38427)

2025-09-23 18:58:46 +02:00

blame_ui.rs

Use title case for UI labels (#49864)

2026-02-23 10:20:31 -05:00

branch_picker.rs

Detect leaked entities at the end of test runs (#50400)

2026-03-02 12:04:13 +01:00

clone.rs

git: Add git clone open listener (#41669)

2025-12-19 00:21:46 -03:00

commit_message_prompt.txt

git_ui: Try to prompt the model out of including the diff output (#26281)

2025-03-07 15:05:35 +00:00

commit_modal.rs

build: Decouple git_ui from recent_projects (#48062)

2026-02-02 13:30:07 +01:00

commit_tooltip.rs

git_graph: Add some design adjustments (#49899)

2026-02-23 17:07:28 +00:00

commit_view.rs

git_ui: Improve connection between the graph and commit views (#50027)

2026-02-25 10:45:14 -03:00

conflict_view.rs

git_ui: Fix "resolve with agent" merge conflict notification (#51290)

2026-03-11 11:35:59 -03:00

file_diff_view.rs

Prevent remote edits from triggering edit predictions when collaborating (#51196)

2026-03-10 15:23:49 +00:00

file_history_view.rs

git_graph: Add some design adjustments (#49899)

2026-02-23 17:07:28 +00:00

git_panel_settings.rs

git: Add diff stats in git_panel (#49519)

2026-02-25 18:32:22 +01:00

git_panel.rs

git: Introduce restore and next action (#50324)

2026-03-09 10:50:43 +00:00

git_picker.rs

git_ui: Add ability to delete git worktrees from picker (#50015)

2026-03-04 21:49:06 +00:00

git_ui.rs

git: Add the ability to resolve merge conflicts with the agent (#49807)

2026-03-10 11:19:26 -03:00

multi_diff_view.rs

Reduce amount of monomorphizations from FnMut closures (#49453)

2026-02-18 12:00:02 +01:00

picker_prompt.rs

gpui: Implement From<String> for ElementId (#44447)

2025-12-09 09:08:59 +01:00

project_diff.rs

git_ui: Fix mouse cursor hiding when clicking git entry in project diff (#51016)

2026-03-07 23:38:28 +05:30

remote_output.rs

git_ui: Ignore extraneous links in git output (#49817)

2026-02-21 21:48:39 +01:00

repository_selector.rs

git_ui: Align repo and branch pickers (#47752)

2026-01-28 11:03:25 -03:00

stash_picker.rs

git_ui: Make stash picker footers button wrap (#49814)

2026-02-24 02:57:44 +00:00

text_diff_view.rs

Prevent remote edits from triggering edit predictions when collaborating (#51196)

2026-03-10 15:23:49 +00:00

worktree_picker.rs

git_ui: Add ability to delete git worktrees from picker (#50015)

2026-03-04 21:49:06 +00:00