Moving to D

[Walter Bright]

Russel Winder wrote:
>> One thing I would dearly like is to be able to merge branches using meld.
>>
>> http://meld.sourceforge.net/
> 
> Why?

Because meld makes it easy to review, selectively merge, and do a bit of editing 
all in one go.


> Mercurial, Bazaar and Git all support a variety of three-way merge tools
> including meld, but the whole point of branching and merging is that you
> don't do it manually -- except in Subversion where merging branching
> remains a problem.

But I want to do it manually.

> With Mercurial, Bazaar and Git, if you accept a changeset from a branch
> you jsut merge it, e.g.
> 
> 	git merge some-feature-branch
> 
> job done.  If you want to amend the changeset before committing to HEAD
> then create a feature branch, merge the incoming changeset to the
> feature branch, work on it till satisfied, merge to HEAD.
> 
> The only time I used meld these days is to process merge conflicts, not
> to handle merging per se. 

I've always been highly suspicious of the auto-detection of a 3 way merge conflict.