Friday, February 13, 2009

I’ve been using a free merge tool called P4Merge and it’s a lot better than the built in one that comes with TortoiseSVN. It seems like it’s a lot more intelligent and figures out when the conflicts are just two adds vs two modifications. Thus, it saved me so much time when doing a merge because I just opened, reviewed, and saved the file with the tool when it was in conflicted state and it had resolved already most of my issues without me doing anything. A lot better than the other tools I’ve used. Obviously, you still need to review each conflict but it should made it a lot easier than previously.

Note that when you run the install just unselect all the other items except for the merge tool.