From: Jeff King <peff@peff.net>
To: Eugene Sajine <euguess@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: cannot find hash in the log output
Date: Fri, 3 Dec 2010 16:52:44 -0500 [thread overview]
Message-ID: <20101203215244.GA4278@sigill.intra.peff.net> (raw)
In-Reply-To: <20101203211158.GA2632@sigill.intra.peff.net>
On Fri, Dec 03, 2010 at 04:11:58PM -0500, Jeff King wrote:
> > 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
prev parent reply other threads:[~2010-12-03 21:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-02 19:57 cannot find hash in the log output Eugene Sajine
2010-12-02 20:48 ` Junio C Hamano
2010-12-02 21:07 ` Eugene Sajine
2010-12-03 17:41 ` Eugene Sajine
2010-12-03 17:52 ` Jeff King
2010-12-03 20:10 ` Eugene Sajine
2010-12-03 20:29 ` Jonathan Nieder
2010-12-03 20:53 ` Eugene Sajine
2010-12-03 20:55 ` Jonathan Nieder
2010-12-03 21:01 ` Eugene Sajine
2010-12-03 21:02 ` Junio C Hamano
2010-12-04 1:08 ` Jonathan Nieder
2010-12-03 21:11 ` Jeff King
2010-12-03 21:52 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101203215244.GA4278@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=euguess@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).