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