Quote:
Originally Posted by Starson17
By the way, the next release will have "Alt-M" as a keyboard shortcut for safe-merge (merge-keep others) as a companion to the "M" keyboard shortcut for a normal merge.
|
Is it
easy to do

: Have a side by side
conflict resolution GUI box appear with replace arrow buttons between the conflicted fields:
source => destination
(fancy tweak: tristate, per field, preference: Always, Never, Ask default: ask )