Search code examples
visual-studio-code

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.


Solution

  • 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"
    },