Moving to D

[Vladimir Panteleev]

On Fri, 07 Jan 2011 01:03:42 +0200, Brad Roberts  
<braddr at slice-2.puremagic.com> wrote:

>   2) walter's workflow meaning that he'll won't use the scm merge
>      facilities.  He manually merges everything.

Not sure about Hg, but in Git you can solve this by simply manually  
specifying the two parent commits. Git doesn't care how you merged the two  
branches. In fact, you can even do this locally by using grafts.

-- 
Best regards,
  Vladimir                            mailto:vladimir at thecybershadow.net