Re: first-class conflicts?
From: Sandra Snan <hidden>
Date: 2023-11-06 22:34:39
From: Sandra Snan <hidden>
Date: 2023-11-06 22:34:39
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.