Re: Challenges for an octopus merge

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