I am currently working on a project that has had a fair amount of development that was done on a branch to support current production while there was some major refactoring and new functionality being added to head. While working independently on each branch, all was fine. So, now i got stuck with doing the merge. Not exactly fun.
I have been using TortoiseSVN’s built in merge tool and was doing pretty good with it. I am not sure that I think it (I assume SVN itself) does as good of a job merging as I thought CVS did, seems like I have a lot of conflicts that I wonder why were conflicts. That said, I got to the point where the merge comparisons were not lining up right and making things very difficult to decide what should be done.
So, I began to search for replacements. I tried 2, but have stuck with one that I think works fairly well. It is the Perforce Visual Merge Tool. While Perforce is not free, the merge tool is. It was easy to setup with TortoiseSVN too:
For ease, here is the command:
C:\Apps\Perforce\P4Merge.exe %base %theirs %mine %merged
(change to match your install path as needed).
Here is a screenshot of one of my merges:
0 comments:
Post a Comment