Isn't there a way to jump between conflicts in VSCode?
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"
},
Search for "HEAD" and use F3 to move to next conflict and Shift+F3 for previous conflict !
VS Code used to provide keyboard shortcuts, but they were removed. You can restore them yourself though, just copy them from here: https://github.com/microsoft/vscode/commit/1de69f4d8d79f370d22f6720b54b7f4a140c60ca.