Recent changes causing `git pull` conflict`

[JalonSolov]

I started seeing this recently, whenever I do a git pull:

error: Your local changes to the following files would be overwritten by merge:
        kernel/blob.patch
Please commit your changes or stash them before you merge.

I have not modified that file, myself, so it must be happening during make distro or make operations. I have to do a git restore on the file before git pull works.

[Ccode-lang]

try running:

git add *
git diff --staged

after a build in a new clone

[Ccode-lang]

this will give what was changed since last commit

[JalonSolov]

A simple git status will tell you what's different. Can't build right now, due to the other issue I entered.

[Ccode-lang]

git status will only tell the files that have changed.
git diff shows the difference of the lines like the ones shown in a Github commit.

[Ccode-lang]

I'm trying to find what is causing the problem for that issue

[JalonSolov]

What's causing the issue is that what is apparently a generated patch file was pushed to the repository, and likely should have been in the .gitignore file instead. That's the only reason simply pulling the code then building will cause the issue.

[Ccode-lang]

ok, interesting.🤔

[Ccode-lang]

Running a test on actions because the build system does not support my mac. It seems to be working so far.