From mboxrd@z Thu Jan  1 00:00:00 1970
From: Markus Elfring <Markus.Elfring@web.de>
Subject: Re: Challenges for an octopus merge
Date: Fri, 08 Apr 2011 17:27:47 +0200
Message-ID: <4D9F2973.2090400@web.de>
References: <4D53F694.1060105@web.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
To: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Fri Apr 08 17:28:05 2011
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@lo.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1Q8DbQ-0007OP-6h
	for gcvg-git-2@lo.gmane.org; Fri, 08 Apr 2011 17:28:04 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932238Ab1DHP17 (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Fri, 8 Apr 2011 11:27:59 -0400
Received: from fmmailgate02.web.de ([217.72.192.227]:34720 "EHLO
	fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751949Ab1DHP16 (ORCPT <rfc822;git@vger.kernel.org>);
	Fri, 8 Apr 2011 11:27:58 -0400
Received: from smtp04.web.de  ( [172.20.0.225])
	by fmmailgate02.web.de (Postfix) with ESMTP id E99BC19BD3F6A
	for <git@vger.kernel.org>; Fri,  8 Apr 2011 17:27:56 +0200 (CEST)
Received: from [78.49.98.66] (helo=[192.168.1.46])
	by smtp04.web.de with asmtp (WEB.DE 4.110 #2)
	id 1Q8DbI-00089e-00
	for git@vger.kernel.org; Fri, 08 Apr 2011 17:27:56 +0200
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.2.14) Gecko/20110221 SUSE/3.1.8 Thunderbird/3.1.8
In-Reply-To: <4D53F694.1060105@web.de>
X-Sender: Markus.Elfring@web.de
X-Provags-ID: V01U2FsdGVkX1+eLvaiCGezGxBkRdtdpzjcjsTh3sy/vKTa/CEQ
	PLAtJvHjI+IJ3sne1ETKuEYfqObvEDG5f3rWlB01nTHvjvjd1q
	hC9GvhoE+GgJuHlBu9lw==
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/171131>

> 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