When merging have a single clicke way to resolve all conflicts using one of the contributors
Basically a shortcut to take one of the 3 versions (source, base, destination) as a result one.
Described in more detail in the end of http://www.plasticscm.net/index.php?/topic/1200-exception-during-3-way-merge-when-pasting-big-text/
22
votes
Ivan Mitev
shared this idea