Re: first-class conflicts?
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
I've sometimes merged stuff in and almost not notice that I had a conflict
in there and in those cases the code wasn't compilable even though I was
using vanilla git.
[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]