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

  Re: pull merge conflicts
  By: Codefenix to Digital Man on Thu Oct 31 2024 11:00 am

 >   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?

Pipelines sometimes fail for reasons unrelated to your changes (happens to me).

I don't think that was the issue. I think the issue was just committing .ini files with the CRLF line endings. That git config setting I mentioned helps me to avoid that situation.
-- 
                                            digital man (rob)

Steven Wright quote #23:
My mechanic told me, I couldn't repair your brakes, so I made your horn louder
Norco, CA WX: 59.7øF, 57.0% humidity, 0 mph NW wind, 0.00 inches rain/24hrs
---
 þ Synchronet þ Vertrauen þ Home of Synchronet þ [vert/cvs/bbs].synchro.net

.