When solving conflicts allow to select from: right, left, right before left, left before right.
This is the only thing I really miss in SmartGit after TortoiseGit.
Though I can add a feature request, seems that that feature was already requested 7 month ago and wasn't done. While this is a really missing feature that is present in another product (TortoiseGit). So, a bit disappointing.
Customer support service by UserEcho