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

[Tomas Hajny]

On 2025-10-23 15:30, brian via fpc-other wrote:


Hi Brian,

> I've been downloading fpc from Git and building it myself.
> 
> 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.
> 
> I've read the Git help, but I don't really understand most of it. :(
> 
> How do I fix this mess? :(

First of all - how did you perform that "replacement"? Do you mean that 
you copied the content of the original drive (including the git checkout 
of FPC sources) to the NAS device? If so and assuming that you have no 
own changes at all in that checkout, the easiest solution for you (since 
you probably don't want to mess with various git commands in order to 
fix the existing files) is probably removing the local checkout and 
performing git clone again.

Hope this helps

Tomas