Constant text conflicts - newb needs some help

[Colin D Bennett]

On Sun, 27 Jul 2008 19:28:05 +0100
Adrian Wilkins <adrian.wilkins at gmail.com> wrote:

> I find that the pain of text conflicts are greatly reduced by a good
> merge tool, in conjunction with the gconflicts command from bzr-gtk.
> 
> On Windows, I'd recommend
> 
> TortoiseMerge (OSS, the merge tool from TortoiseSVN)
> WinMerge (OSS)
> Beyond Compare 3 (pay-for CSS, but by far the best merge tool I use
> and the licenses are very reasonable).
> 
> On Linux, I have no experience, but I've at least heard of things like
> 
> KDiff
> 
> and my favourite on Windows, Beyond Compare 3, is also available for
> Linux as a seperate Linux license or a dual Win/Lin combo pack.

I recommend the following free software merge tools:

* bzr `extmerge`_ plugin

* one of `kdiff3`_ or `meld`_ as GUI merge tools -- I use meld the most

.. _extmerge: http://erik.bagfors.nu/bzr-plugins/extmerge/
.. _kdiff3: http://kdiff3.sourceforge.net/
.. _meld: http://meld.sourceforge.net/

Regards,
Colin