Thread (21 messages) 21 messages, 7 authors, 2023-11-12

Re: first-class conflicts?

From: Dragan Simic <hidden>
Date: 2023-11-06 22:01:22

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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help