by sorin » Wed Jul 18, 2007 3:44 pm
Hello,
I added an enhancement request for adding actions to keep both the "mine" and "theirs" variant of the conflict. For the replacement actions you resolve first the conflicts in which you replace the local variant with the variant from the repository revision. You resolve the conflicts in which you want to keep the local variant with the action Mark As Merged executed on the file. This action marks all the current changes as outgoing changes so the next Commit action places the local version of the file as the latest on the repository.
Regards,
Sorin