Re: Collaborative conflict resolution feature request

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 13, 2020, 19:34 UTC
Message-ID: <xmqq366yzrn1.fsf@gitster.c.googlers.com>
In-Reply-To: <xmqqa716zs7w.fsf@gitster.c.googlers.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 5 quoted lines

> ...  Luckily, most end users would get their Git from
> packagers and they are good at doing the bundling (i.e. the
> "git-core" package may "suggest" the "git-imerge" package).
>
> So...

So my answer to your idea/opinion is that we shouldn't waste engineering effort to "have something like imerge integrated into git itself", but we should help distro packages to do the bundling of "git" itself and all the good things around it. One way of doing it may be by keeping an official curated list of "third-party things we find good" somewhere (it can be in-tree in my release tarballs, but it does not have to be---some page on git-scm.com could just be fine; as long as the quality of the list is maintained to our standards, where the packagers and end users see it does not really matter).

And such a list would also help those who prefer to build and install things by hand.