From: Sandra Snan <sandra.snan@idiomdrottning.org>
Date: Mon, 06 Nov 2023 22:34:35 GMT
Subject: Re: first-class conflicts?
Message-ID: <Mr.4OIMhhBXVmQ.FTCKAvYUnjv@idiomdrottning.org>
In-Reply-To: <ef30a484525157579c64249a396f10ae@manjaro.org>

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.