0
Duplicate
Conflict Solver: allow to use both side changes
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.
Customer support service by UserEcho
https://smartgit.userecho.com/topics/64-add-take-both-merge-option/