From: Dragan Simic <dsimic@manjaro.org>
To: Elijah Newren <newren@gmail.com>
Cc: Sandra Snan <sandra.snan@idiomdrottning.org>, git@vger.kernel.org
Subject: Re: first-class conflicts?
Date: Tue, 07 Nov 2023 09:21:22 +0100 [thread overview]
Message-ID: <6f15723ef86a40e939b98b731cd8026e@manjaro.org> (raw)
In-Reply-To: <CABPp-BH7WBm1j-Ue9oZFjoy6sTcw5B0hz_ndDEtJqvpZF4YF=w@mail.gmail.com>
On 2023-11-07 09:16, Elijah Newren wrote:
> But we'd also have to be careful and think through usecases, including
> in the surrounding community. People would probably want to ensure
> that e.g. "Protected" or "Integration" branches don't get accept
> fetches or pushes of conflicted commits, git status would probably
> need some special warnings or notices, git checkout would probably
> benefit from additional warnings/notices checks for those cases, git
> log should probably display conflicted commits differently, we'd need
> to add special handling for higher order conflicts (e.g. a merge with
> conflicts is itself involved in a merge) probably similar to what jj
> has done, and audit a lot of other code paths to see what would be
> needed.
That would be a truly _massive_ project.
next prev parent reply other threads:[~2023-11-07 8:21 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 21:17 first-class conflicts? Sandra Snan
2023-11-06 22:01 ` Dragan Simic
2023-11-06 22:34 ` Sandra Snan
2023-11-06 22:34 ` rsbecker
2023-11-06 22:45 ` Sandra Snan
2023-11-07 0:50 ` Theodore Ts'o
2023-11-11 1:31 ` Junio C Hamano
2023-11-11 7:48 ` Sandra Snan
2023-11-12 15:21 ` Theodore Ts'o
2023-11-12 23:25 ` Junio C Hamano
2023-11-07 11:23 ` Phillip Wood
2023-11-07 11:24 ` Sandra Snan
2023-11-07 8:16 ` Elijah Newren
2023-11-07 8:21 ` Dragan Simic [this message]
2023-11-07 9:16 ` Sandra Snan
2023-11-07 11:49 ` Phillip Wood
2023-11-07 17:38 ` Martin von Zweigbergk
2023-11-08 7:31 ` Elijah Newren
2023-11-08 18:22 ` Martin von Zweigbergk
2023-11-10 21:41 ` Elijah Newren
2023-11-12 7:05 ` Martin von Zweigbergk
2023-11-09 14:50 ` phillip.wood123
2023-11-08 6:31 ` Elijah Newren
2023-11-09 14:45 ` Phillip Wood
2023-11-10 22:57 ` Elijah Newren
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=6f15723ef86a40e939b98b731cd8026e@manjaro.org \
--to=dsimic@manjaro.org \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=sandra.snan@idiomdrottning.org \
/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).