Re: A generalization of git notes from blobs to trees - git metadata?

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 10, 2010, 05:23 UTC
Message-ID: <7vvde5irzz.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100210050902.GD28526@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 17 quoted lines

> On Sun, Feb 07, 2010 at 12:25:13PM -0800, Junio C Hamano wrote:
>
>> Suppose Alice, Bob and I are involved in a project, and we annotate
>> commits for some shared purpose (say, tracking regressions).  Alice and
>> Bob may independently annotate overlapping set of commits (and hopefully
>> they have shared root for their notes history as they are collaborating),
>> and they may even be working together on the same issue, but I may not be
>> involved in the area.  What happens when I pull from Alice and Bob and get
>> conflicts in notes they produced, especially the only reason I was
>> interested was because they have new things to say about commits that I am
>> interested in?
>
> Hmm. OK, I see the point of Jakub's message a bit more now. You want to
> create a new view, inconsistent with that of either Alice or Bob (that
> is, you have taken snippets of each's state, but you cannot in good
> faith represent this as a history merge, because your state should not
> supersede either of theirs).

In the message you are quoting, I am not interested in creating a narrowed view. If I cannot resolve conflicts between Alice and Bob in a merge in the contents space, I would ask either of them (because they are more familiar with the area) to do the merge. I however was unsure if asking the same for merges in the notes space is a reasonable thing to do.