|
Something that may not be that difficult to do :
keep either one version, remote or local but add a group "conflicts" and put all topics in conflict in this group.
The merge would be done manually by the user. Simply delete de group if no merge is required.
|