Keyboard shortcut to resolve one conflict? Follow
Hi, when resolving conflicts, I use F7 to skip to the next conflict and I resolve most conflicts by 'Resolve using Left' or 'Resolve using Right' using mouse. The functionality is great, especially with the option to 'Apply All Non-Conflicting Changes'.
My question is whether there is a way to 'Resolve using Left' or 'Resolve using Right' from the keyboard?
Please sign in to leave a comment.
Hello Deasy Dave
There is a shortcut for "Accept Right/Left" it can be found under Version Control Systems | Diff & Merge in Preferences | Keymap
It should be Ctrl+Shift+Arrow Key for windows and Control+Shift+arrow key for Mac