Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Isn't there a way to jump between conflicts in VSCode?

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).

Conflict mode Note: This is different than compare mode where adds and dels are marked with red and green and F7 or the arrows works.

like image 619
andrew Avatar asked Sep 08 '17 22:09

andrew


People also ask

How do you jump in VS code?

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.


1 Answers

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" }, 
like image 117
Llewey Avatar answered Sep 17 '22 21:09

Llewey