Files
zed/crates
Danilo Leal f2e9c5a025 Fix when agent-powered merge conflict button shows up (#54791)
This PR fixes the logic to dismiss the "resolve merge conflict with
agent" button. Previously, we were just observing
`merge_heads_by_conflicted_path`, which seems to be intentionally
sticky, preserving the conflicted paths until changes are either
committed or aborted. This would make the button to resolve conflicts
show up even _after_ the changes get resolved. Now, we're checking
whether paths are _currently_ conflicted (`is_conflicted()`), and if
they are not, we don't display the button, even though the resolution
might have not been committed or aborted yet.

As a bonus, in this PR, I'm also putting the resolve conflict button
_before_ the activity indicator, so as to avoid bounciness, and did a
quick polish of the activity indicator button itself, by using the
`Button` component.

Release Notes:

- Fixed a bug with the merge conflict "resolve with agent" button where
it would be displayed even though all conflicts have already been
resolved.
2026-04-24 14:41:44 +00:00
..
2026-04-05 23:05:35 +01:00
2026-03-27 14:56:46 -07:00
2026-04-21 07:25:22 +00:00
2026-03-30 09:06:59 +00:00
2026-04-22 15:02:57 +00:00
2026-04-24 08:31:43 +00:00