[Dxspider-support] Git error

[IK5ZUK Luigi]

Hi Dirk,
thanks for your help. I've not changed the files, of course: they are as 
you left them.

I've solved a few minutes ago doing "git reset --hard" and then "git 
pull", so I suppose is too late to made a "git diff"... isn't it ?!?

73 Luigi IK5ZUK

Luigi - IK5ZUK
Qth: Pisa
Locator: JN53FQ
Mail: ik5zuk at tiscali.it

Il 07/06/2020 18.49, Dirk Koopman via Dxspider-support ha scritto:
> 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
>>
>
>
> _______________________________________________
> Dxspider-support mailing list
> Dxspider-support at tobit.co.uk
> https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support