Constant text conflicts - newb needs some help

[Adrian Wilkins]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


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'm not employed by Scooter Software, by the way :-)


Your questions about merging (for examples) in separate functions are
relevant, as you can conceivably get much more intelligent merging from
a merge tool which is aware of structure of the content. AFAIK, the
default merging in Bazaar is purely line-based and thus proximity is the
only consideration. I don't believe it's pluginizable as yet, although
I'd like to see it ; some of the tools I use have a delightful habit of
shoving many kilobytes of HTML documentation onto a single line of text
which leads to a consistent conflict whenever two people edit (and the
documentation is the main content). I have a means of unravelling this
through Tidy and merging manually, but automating this would be much easier.




-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIjL41cP1uebIhWSYRAuKRAJsFkvLa5vQHttnAc1w+kF3uFYUFYwCfX6+g
OwPjNm1lXGJqDTKDwDcDfko=
=ZkQM
-----END PGP SIGNATURE-----