[Dxspider-support] Git error

[Dirk Koopman]

Have you changed any of these files? Or are they as I left them?

Can you do a 'git diff' and send the result to me please.

Then:

git stash      # just to be safe
git reset --hard
git pull

On 07/06/2020 17:37, IK5ZUK Luigi via Dxspider-support wrote:
> Hello all,
> doing "git pull" I've received the following:
>
> sysop at server:/spider$ git pull
> Aggiornamento di 77592822..e884309a
> error: Your local changes to the following files would be overwritten 
> by merge:
>         data/prefix_data.pl
>         perl/Console.pm
>         perl/DXSql.pm
>         perl/Prefix.pm
>         perl/RBN.pm
> Please commit your changes or stash them before you merge.
> Aborting
> sysop at server:/spider$
>
> What's happening ? Any help ?
>
> 73 Luigi IK5ZUK
>