From: Dragan Simic Date: Mon, 06 Nov 2023 22:01:18 GMT Subject: Re: first-class conflicts? Message-ID: In-Reply-To: <87cywmintp.fsf@ellen.idiomdrottning.org> On 2023-11-06 22:17, Sandra Snan wrote: > Is this feature from jj also a good idea for git? > https://martinvonz.github.io/jj/v0.11.0/conflicts/ Hmm, that's quite interesting, but frankly it makes little sense to me. See, the source code in a repository should always be in a compileable or runnable state, in each and every commit, so going against that rule wouldn't make much sense. Just think about various CI/CD tools that also expect the same.