Three Way Merging Made Painless With P4Merge And TortoiseSVN

There is a fear of merging amongst developers (mostly juniors) and it is due to the fact that they don't merge often enough and sometimes don't use the proper tooling to make this process manager-proof.

In order to ease the pain of merging, let's use some proper merging tools.

P4Merge seems the best contender as:

  • it has 3 way-merge
  • it sports an foolproof change tracker (aka. the change 'curved area thingie')
  • it costs GBP 0.00
Let's see how to install this with tortoise svn and go through a real-world conflict.