Re: cannot find hash in the log output

From: Jeff King <peff@peff.net>
Date: Dec 3, 2010, 21:52 UTC
Message-ID: <20101203215244.GA4278@sigill.intra.peff.net>
In-Reply-To: <20101203211158.GA2632@sigill.intra.peff.net>

On Fri, Dec 03, 2010 at 04:11:58PM -0500, Jeff King wrote:

Show 8 quoted lines

> > Yes this does make sense to me. Although it is not necessary to have
> > conflicts during the merge - recursive merge as i understand also can
> > create new blobs.
> 
> I haven't thought about it too hard, but I don't see why any merge would
> create a new blob unless there is a conflict. Otherwise you are always
> taking one of the blobs that already exists in some other part of
> history.

Er, sorry, this is totally wrong. For some reason I said "conflict" (repeatedly) when I meant "trivial merge". I guess my brain is not working today.

Any time you have to do file-level merging (i.e., because both sides of the merge touched that path) you will create a new blob, conflicts or no.

-Peff