From: Christian Couder <christian.couder@gmail.com>
To: "Curtin, Eric" <Eric.Curtin@dell.com>
Cc: demerphq <demerphq@gmail.com>,
Konstantin Tokarev <annulen@yandex.ru>,
Junio C Hamano <gitster@pobox.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>,
"Coveney, Stephen" <Stephen.Coveney@dell.com>
Subject: Re: Collaborative conflict resolution feature request
Date: Sat, 20 Jun 2020 18:09:54 +0200 [thread overview]
Message-ID: <CAP8UFD2t6OVFWjm76oy=+Fgo1UUepwHTpOWM8vmCYzs9hSy_ug@mail.gmail.com> (raw)
In-Reply-To: <BY5PR19MB34000FB239B2B7BD996A17C790980@BY5PR19MB3400.namprd19.prod.outlook.com>
On Fri, Jun 19, 2020 at 11:17 AM Curtin, Eric <Eric.Curtin@dell.com> wrote:
> Would it be reasonable if anyone could push a partial resolution but the book
> stops there (once a user hits a conflict of a conflict is must be solved
> locally)? I agree it doesn't make sense in most cases to support pushing
> recursive conflict resolutions (even though the other part of me says if the
> users wants to go down that path why stop them? You could even have a config
> setting to allow N levels of conflicts to be pushed, the default setting being
> exactly the way things are, none or 0!).
>
> I know in my project we already "fake" this functionality like pointed out in
> the first email, it's just unclean the way we do it, leaves broken commits
> in the repo, you can no longer use difftools, etc.
>
> Should I even consider this as a research idea for my thesis? Or another way
> of wording this is, if someone sent the code to the git maintainers Junio, etc.
> would it be merged into git?
I think it could be an interesting feature to add to Git, as I agree
that some people often have this kind of issues with conflicts.
What could perhaps work is to develop a new command, maybe called `git
conflict` with subcommands for example to load, save and maybe push,
fetch and resolve partial resolutions of conflicts. The conflicts
could perhaps be stored as commits in the "refs/conflicts/" ref
namespace.
next prev parent reply other threads:[~2020-06-20 16:10 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
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 [this message]
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='CAP8UFD2t6OVFWjm76oy=+Fgo1UUepwHTpOWM8vmCYzs9hSy_ug@mail.gmail.com' \
--to=christian.couder@gmail.com \
--cc=Eric.Curtin@dell.com \
--cc=Niall.Geary@dell.com \
--cc=Scott.Rowlands@dell.com \
--cc=Stephen.Coveney@dell.com \
--cc=annulen@yandex.ru \
--cc=demerphq@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 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 NNTP newsgroup(s).