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

first-class conflicts?

From: Sandra Snan <hidden>
Date: 2023-11-06 21:26:10

Is this feature from jj also a good idea for git?
https://martinvonz.github.io/jj/v0.11.0/conflicts/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help