Is there a keybinding for the Resolve
button? If you hover over the Stage
button it reveals the shift+enter shortcut:
However, no such shortcut appears when you hover over Resolve
. This seems odd to me as this is a primary action when resolving merge conflicts.