From: Markus Elfring <markus.elfring@web.de>
Date: Fri, 08 Apr 2011 15:27:47 GMT
Subject: Re: Challenges for an octopus merge
Message-ID: <4D9F2973.2090400@web.de>
In-Reply-To: <4D53F694.1060105@web.de>

> Automatic merge failed; fix conflicts and then commit the result.

I would appreciate if the implementations of merge procedures could be improved 
so that work results like the following can be achieved in an easier way.
https://github.com/elfring/BtYacc/tree/route1

Can any documentation updates help in this use case, too?

Regards,
Markus