search

microsoft / vscode

Visual Studio Code
https://code.visualstudio.com
MIT License
163.98k stars 29.19k forks source link

Merge editor: expose commands for "accept left/right/combination" for current selection #211833

Open OliverJAsh opened 6 months ago

OliverJAsh commented 6 months ago

When I have a merge conflict selected in the merge editor, I would like to be able to accept left/right/combination using a keyboard shortcut. I believe this requires commands which are currently missing. We have merge.acceptAllInput1 and merge.acceptAllInput2 but we need something for the current selection.

arthur-presti commented 3 months ago

merge.toggleActiveConflictInput1 and 2 seem to fit the bill, but there is no combination variant.

elektronik2k5 commented 1 month ago

I'd like to add to that, once the commands are in place: UI buttons in the gutters for these commands, like in any mature differ (such as meld).