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

error: Your local changes to the following files would be overwritten by merge:
xtrn/mrc/mrc-theme-aqua.ini
xtrn/mrc/mrc-theme-default.ini
xtrn/mrc/mrc-theme-garden.ini
xtrn/mrc/mrc-theme-hot.ini
xtrn/mrc/mrc-theme-lilac.ini
xtrn/mrc/mrc-theme-midnight.ini
xtrn/mrc/mrc-theme-neon.ini
xtrn/mrc/mrc-theme-rustic.ini
xtrn/mrc/mrc-theme-stone.ini
Please commit your changes or stash them before you merge.

Deleting the offending files and then invoking a 'git pull' (or 'git up' as I do), appears to be the easiest resolution to the problem.

Git doesn't handling Unix (LF) versus Windows (CRLF) line-ending differences perfectly in all situations. To help with this, I use this git config option on my dev systems:
$ git config merge.renormalize
true
--
digital man (rob)

Rush quote #62:
He's a restless young romantic, wants to run the big machine .. New World Man Norco, CA WX: 72.5øF, 28.0% humidity, 2 mph W wind, 0.00 inches rain/24hrs
--- SBBSecho 3.20-Linux
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)

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

As the result of a recent merge to the master branch, a lot of folks (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 ]=-
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)

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

As the result of a recent merge to the master branch, a lot of folks (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
--- SBBSecho 3.20-Linux
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)