Tag: DiffMerge
-
Using DiffMerge as your Subversion external merge tool
I’m not a fan of conflicts, especially source control merge conflicts. Recently for a project, I had to merge some code into our main trunk in svn from a maintenance branch and ran into bunch of problems due to merge conflicts. Since it wasn’t my code that conflicted and there…
the semi-crazy blog 