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:[email protected]
