From: Junio C Hamano Date: Thu, 22 Apr 2010 00:12:38 GMT Subject: Re: 'git notes merge' implementation questions Message-ID: <7v8w8g8hvt.fsf@alter.siamese.dyndns.org> In-Reply-To: <201004220208.03706.johan@herland.net> Johan Herland writes: > Ok, I'm just worried that it'll force us to re-implement much of the three- > way merge logic that's already implemented in the merge machinery. There is no way around it, as long as you have that variable fan-out in the notes structure. Changing and unstabilizing "merge" for dubious benefit of code reuse is unacceptable, as the part that deals with variable fan-out has no benefit to the regular "merge".