first-class conflicts?
[
Date Prev
][
Date Next
][
Thread Prev
][
Thread Next
][
Date Index
][
Thread Index
]
Subject
: first-class conflicts?
From
: Sandra Snan <sandra.snan@xxxxxxxxxxxxxxxxxx>
Date
: Mon, 06 Nov 2023 22:17:22 +0100
Is this feature from jj also a good idea for git?
https://martinvonz.github.io/jj/v0.11.0/conflicts/
Follow-Ups
:
Re: first-class conflicts?
From:
Elijah Newren
Re: first-class conflicts?
From:
Dragan Simic
Prev by Date:
git refusing to merge branches when pulling using a refspec
Next by Date:
Re: first-class conflicts?
Previous by thread:
git refusing to merge branches when pulling using a refspec
Next by thread:
Re: first-class conflicts?
Index(es):
Date
Thread
[Index of Archives]
[Linux Kernel Development]
[Gcc Help]
[IETF Annouce]
[DCCP]
[Netdev]
[Networking]
[Security]
[V4L]
[Bugtraq]
[Yosemite]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Linux SCSI]
[Fedora Users]