On Saturday, 12 May 2012 at 18:25:33 UTC, Walter Bright wrote:
On 5/9/2012 9:37 AM, Iain Buclaw wrote:
The procedure is 'get it done' approach. Meld helps alot,
not having
too many differences between the frontends helps alot, using
the D2
testsuite at every stage of the process helps alot.
I don't know what I'd do without meld these days. It's one of
the most useful programming tools to come down the pike in
years!
There's a workalike on Windows called "winmerge" for those who
develop on Windows.
I don't know about meld, but I've found kdiff3 very good for
3-way merge. Its merging algorithm is good and does most of the
work.
A very good list of merging tools:
http://stackoverflow.com/questions/572237/whats-the-best-three-way-merge-tool
