From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 25 Nov 2010 09:45:52 GMT
Subject: Re: What's cooking in git.git (Nov 2010, #03; Wed, 24)
Message-ID: <AANLkTi=U=Km28W-xUM0vmRhhYCuhjSxxk5Fk_yhvjz8K@mail.gmail.com>
In-Reply-To: <7vk4k2rt2m.fsf@alter.siamese.dyndns.org>

On Thu, Nov 25, 2010 at 04:16, Junio C Hamano <gitster@pobox.com> wrote:

> It is getting ridiculously painful to keep re-resolving the conflicts with
> other topics in flight, even with the help with rerere.
>
> Needs a bit more minor work to get the basic code structure right.

Still waiting on input about what exactly needs to be fixed. See
<AANLkTikw0+FGJmj7C0B9J_3ZVXrbqCw+UzyP3sqfyVdm@mail.gmail.com.

Is there anything else than that (the builtin.h includes) that you
think needs work?