From: Konstantin Tokarev <annulen@yandex.ru>
To: Junio C Hamano <gitster@pobox.com>,
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: Sun, 14 Jun 2020 16:00:33 +0300 [thread overview]
Message-ID: <30661592138737@mail.yandex.ru> (raw)
In-Reply-To: <xmqqa716zs7w.fsf@gitster.c.googlers.com>
13.06.2020, 22:22, "Junio C Hamano" <gitster@pobox.com>:
> Christian Couder <christian.couder@gmail.com> writes:
>
>> My opinion is that it would be nice to have something like git-imerge
>> integrated into Git.
>
> I am not sure what you mean by "integrated into", but if you are
> talking about somehow reinventing it, I do not think it is a good
> idea at all. "imerge" works quite well already.
No it doesn't. It has performance issues which makes it practically useless
on the large scale repositories because of slow progress even on fastest
machines. See for example
https://github.com/mhagger/git-imerge/issues/66
https://github.com/mhagger/git-imerge/issues/149
Also, maybe a bit irrelevant, but it was recently removed from Gentoo
because it didn;t work with Python >= 3.7
next prev parent reply other threads:[~2020-06-14 13:05 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
2020-06-14 11:05 ` Philip Oakley
2020-06-14 13:00 ` Konstantin Tokarev [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=30661592138737@mail.yandex.ru \
--to=annulen@yandex.ru \
--cc=christian.couder@gmail.com \
--cc=eric.curtin@dell.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=niall.geary@dell.com \
--cc=scott.rowlands@dell.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).