Easy code merging with WinMerge

A couple of days ago I ran into an annoying scenario: the merging of two source files which reside in two different SVN repositories. TortoiseSVN, my favorite SVN client on Windows has the clout to tackle this task with its built-in diff editor, except that it doesn’t work for files in different repositories (or non-versioned files). A quick Google search brought me to the open-source WinMerge.

WinMerge offers a user-friendly and extremely interface, offering many features like:

  • Folder compare
  • File compare (differences within lines, moved-lines detection, etc.)
  • Version control features (conflict resolving, patch file generation, etc.)
  • Integration with TortoiseSVN, Visual SourceSafe, etc.
  • Shell integration

Download WinMerge.

This is certainly a tool to try if you’re stuck merging files with the default merging tool or just can’t get stuff merged somehow.

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s