[fpc-other] (Probably trivial) git help, please

[Christo Crause]

On Fri, Oct 24, 2025 at 10:19 AM brian via fpc-other <
fpc-other at lists.freepascal.org> wrote:

>
> I've just replaced one drive on my PC with a NAS device. Now when I
> try to do a git pull, git asks me to stash or merge a whole bunch of
> local files which it alleges I have modified. Of course, I have made
> no modifications at all.
>

 It could be due to change in file mode when copying the git folder across
different file systems.  I had a similar issue when copying a git folder
from ext4 to FAT32 and back to ext4. For more information read up on the
core.filemode configuration option (https://git-scm.com/docs/git-config).
IIRC I fixed my issue by stashing the changes (git stash), then pulling
main, then delete this stash since it is bogus (git stash drop).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freepascal.org/pipermail/fpc-other/attachments/20251024/0aeafcb9/attachment.htm>