From: Dragan Simic Date: Tue, 07 Nov 2023 08:21:22 GMT Subject: Re: first-class conflicts? Message-ID: <6f15723ef86a40e939b98b731cd8026e@manjaro.org> In-Reply-To: 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.