Hi, >> Did you use MergeTool? I'm thinking of downloading it and trying it out. It may help a little but not a lot for simple changes as you still have to resolve the conflicts.
It's certainly not quite as smart as SVN re conflicts but I guess it can't be because of t's distributed nature. Most of the conflicts I saw would not of been conflicts under SVN including files that were in conflict but had 100% identical content. Thanks, Justin
