Git: conflicted files from applying stash forces people to commit, you can't unstage it

Reproduction steps

1. Git project
2. Stash something
3. Commit something that would conflict with the stash
4. Apply that stash

Current vs. Expected behavior

The git panel has 3 sections: conflicts, tracked, and untracked. The conflicted content from the applied stash goes into the conflict panel, which is good, but its stage toggle should not freeze after toggling; the file should instead be moved to the tracked section after it is resolved, or add another "solve stash conflict" button that will do that.

Zed version and system specs

Zed: v1.26.2+stable.384.c4273271092b0287f7d181f616bd5171e0a2f70c (Zed) OS: Linux X11 linuxmint 22.3 Memory: 15.5 GiB Architecture: x86_64 GPU: Intel(R) HD Graphics 620 (KBL GT2) || Intel open-source Mesa driver || Mesa 25.2.8-0ubuntu0.24.04.4

Attach Zed log file

undefined

Relevant Zed settings

undefined

Relevant Keymap

undefined

(for AI issues) Model provider details

No response

If you are using WSL on Windows, what flavor of Linux are you using?

No response