Cole MillerandBennet Bo Fenner 18674760c7 git: Fix conflicted paths not getting cleared (#50327) ...

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed a bug where files would still be marked as having git conflicts
after resolving them.

---------

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>

2026-03-02 13:40:34 +00:00

..

color_extractor.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

context_server_store.rs

agent: Fix disabled MCP servers disappearing from UI after restart (#47758)

2026-02-09 00:56:20 +01:00

debugger.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

ext_agent_tests.rs

agent_servers: Migrate all built-in agents to go via registry (#50094)

2026-02-26 12:24:39 +00:00

extension_agent_tests.rs

agent_servers: Migrate all built-in agents to go via registry (#50094)

2026-02-26 12:24:39 +00:00

git_store.rs

git: Fix conflicted paths not getting cleared (#50327)

2026-03-02 13:40:34 +00:00

image_store.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

lsp_command.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

lsp_store.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

manifest_tree.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

project_search.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

project_tests.rs

git: Fix conflicted paths not getting cleared (#50327)

2026-03-02 13:40:34 +00:00

search_history.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

search.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

signature_help.rs

Use SharedString::new_static for string literals (#47865)

2026-01-28 15:12:48 +00:00

task_inventory.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

trusted_worktrees.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

yarn.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00