mirror of
https://github.com/zed-industries/zed.git
synced 2026-05-29 19:14:13 +00:00
91fc544a03
Follow up to https://github.com/zed-industries/zed/pull/49807 Previously, when there were multiple conflicts across the codebase, we would pop a toast at the bottom right corner of the UI. A toast seemed like a functional idea because it'd be visible from any state of the app and thus it'd be a good place to expose the button that allows you to quickly prompt the agent to resolve all conflicts, as opposed to creating a thread for each individual one. However, the toast was met with some negative (and correct) feedback, mostly because it is interruptive, and thus can sometimes block very relevant surfaces, like either the agent panel itself or the Git commit area. Therefore, in this PR, I'm removing the toast and adding a button in the status bar instead; a bit more minimal, not interruptive, and a common place for other items that might require your attention. The status bar can be quite busy these days, though; we can display diagnostics, LSP status, and file names in there; conscious of that. But it felt like it could work given this button is such a transient one that you can either easily manually dismiss or wait for it to be auto-dismissed as you or the agent resolves the merge conflicts. <img width="500" height="864" alt="Screenshot 2026-04-02 at 9 15@2x" src="https://github.com/user-attachments/assets/4412a05c-77d0-4391-8ea1-25d1749b5e20" /> Release Notes: - Git: Improved how we surface the affordance to resolve codebase-wide merge conflicts with the agent in the UI. - Agent: Added a setting to control whether or not the button to resolve merge conflicts with the agent should be displayed. |
||
|---|---|---|
| .. | ||
| default.json | ||
| default_semantic_token_rules.json | ||
| initial_debug_tasks.json | ||
| initial_local_debug_tasks.json | ||
| initial_local_settings.json | ||
| initial_server_settings.json | ||
| initial_tasks.json | ||
| initial_user_settings.json | ||