Re: Collaborative conflict resolution feature request

From: Philip Oakley <philipoakley@iee.email>
Date: Jun 14, 2020, 11:05 UTC
Message-ID: <1dd94931-83ac-4036-2317-0f3aa166d61c@iee.email>
In-Reply-To: <xmqq366yzrn1.fsf@gitster.c.googlers.com>

On 13/06/2020 20:34, Junio C Hamano wrote:

Show 20 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
>
>> ...  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.

For the imerge tool, it may be worth having an extra sub-heading (Merge Tools?) within the "HOW TO RESOLVE CONFLICTS" section of the git-merge man page.

The merge.guitool configuration does list a lot of pre-configured tools (the list could be moved to the mergetool man page?)

Curating the list of tools maybe could be done in the same way the config entries are now being done, i.e. by area, so they can be included in the relevant man pages, with just a single source of 'nice tools'.

Philip