Subj : pull merge conflicts
To   : Digital Man
From : Codefenix
Date : Thu Oct 31 2024 11:00:00

  Re: pull merge conflicts
  By: Digital Man to All on Wed Oct 30 2024 03:43 pm

 DM> As the result of a recent merge to the master branch, a lot of folks
 DM> (everyone, likely) is getting git pull error similar to the following:

Sorry about that. I think I screwed up my most recent attempt at submitting a merge request. The pipeline failed on the first attempt, so I deleted my clone of sbbs and cloned it again, then re-attempted my merge, and the pipeline succeeded. Did I make things worse in the process?
       
|09|11codefenix |08-|09 ConstructiveChaos |01BBS   
|08 (https/telnet/ssh)|07://|03conchaos.synchro.net   
|07

....A man does not look behind the door unless he has stood there himself.
---
 þ Synchronet þ -=[ ConstructiveChaos BBS | conchaos.synchro.net ]=-

.