Allow undoing merge conflict actions #44124
PCOffline
started this conversation in
Feature Requests
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
-
When in a merge conflict, selecting either HEAD, Origin or Both is an irreversible action in the Zed editor currently. Pressing the undo keybind does not revert the resolution.
It would be very handy to add this as a capability, instead of re-doing the entire merge conflict every time a mistake has been made.
Beta Was this translation helpful? Give feedback.
All reactions