Subj : pull merge conflicts
To   : All
From : Digital Man
Date : 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:

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

.