From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: "Curtin\, Eric" <Eric.Curtin@dell.com>,
"git\@vger.kernel.org" <git@vger.kernel.org>, "Geary\,
Niall" <Niall.Geary@dell.com>, "rowlands\,
scott" <Scott.Rowlands@dell.com>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: Collaborative conflict resolution feature request
Date: Sat, 13 Jun 2020 12:34:42 -0700 [thread overview]
Message-ID: <xmqq366yzrn1.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqa716zs7w.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Sat, 13 Jun 2020 12:22:11 -0700")
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.
next prev parent reply other threads:[~2020-06-13 19:34 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-12 14:08 Collaborative conflict resolution feature request Curtin, Eric
2020-06-13 11:33 ` Johannes Sixt
2020-06-13 12:08 ` Christian Couder
2020-06-13 12:38 ` Curtin, Eric
2020-06-13 13:14 ` Philip Oakley
2020-06-13 16:44 ` Junio C Hamano
2020-06-15 9:51 ` Sergey Organov
2020-06-15 11:04 ` Philip Oakley
2020-06-16 17:17 ` Stefan Moch
2020-06-17 18:32 ` Curtin, Eric
2020-06-17 21:17 ` Sergey Organov
2020-06-13 17:10 ` Christian Couder
2020-06-13 19:22 ` Junio C Hamano
2020-06-13 19:34 ` Junio C Hamano [this message]
2020-06-14 11:05 ` Philip Oakley
2020-06-14 13:00 ` Konstantin Tokarev
2020-06-15 9:28 ` Curtin, Eric
2020-06-15 11:31 ` Philip Oakley
2020-06-15 16:57 ` Junio C Hamano
2020-06-15 17:32 ` Chris Torek
2020-06-16 15:56 ` Chris Torek
2020-06-15 19:37 ` Philip Oakley
2020-06-17 18:30 ` Junio C Hamano
2020-06-18 8:11 ` demerphq
2020-06-18 8:53 ` Curtin, Eric
2020-06-18 9:28 ` Curtin, Eric
2020-06-18 10:14 ` demerphq
2020-06-19 9:17 ` Curtin, Eric
2020-06-20 16:09 ` Christian Couder
2020-06-21 0:20 ` Curtin, Eric
2020-06-16 9:08 ` Christian Couder
2020-06-15 12:55 ` Sergey Organov
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=xmqq366yzrn1.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=Eric.Curtin@dell.com \
--cc=Niall.Geary@dell.com \
--cc=Scott.Rowlands@dell.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.