You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Feat: pressing "u" undoes modification to result buffer regardless of active buffer location #271
One point of friction is undoing accept actions in merge mode. The issue is that in order to perform a conflict by conflict action you must be in one of the non-modifiable buffers, after performing an action, it updates the Result buffer, all good so far. The problem is, if I want to undo an action I have to navigate to the result buffer press undo, then navigate back to one of the non-modifiable buffers, making this a bit of a pain.
Proposal:
Option A: make pressing "u" whether in result or not, undo changes to the result buffer; this makes sense given the other two are non-modifiables anyways.
Option B: add a dedicated keymaps for undo actions ("Undo previous diff action").
Activity