Despite my googling, I can't find a keyboard shortcut (or any shortcut) to jump to the next conflict when you're in viewing a file in conflict mode (opening a file marked (C) in the source control panel, where the Accept Current Change | Accept Incoming Change | etc
menu is shown).
Note: This is different than compare mode where adds and dels are marked with red and green and F7 or the arrows works.
VS Code provides two powerful commands to navigate in and across files with easy-to-use key bindings. Hold Ctrl and press Tab to view a list of all files open in an editor group. To open one of these files, use Tab again to pick the file you want to navigate to, then release Ctrl to open it.
You are looking for these commands:
// merge-conflict.next // merge-conflict.previous
So you can put something like this in your keybindings.json
file:
{ "key": "<your key here>", "command": "merge-conflict.next" },
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With