[Dxspider-support] Git Error Help Please

[Keith Le Boutillier]

Hi

Running Spider on a raspberry Pi and it been fine all year and I have been able to do updates using GIT
But now I am getting this error message

error: Your local changes to the following files would be overwritten by merge:
        Changes
        data/cty.dat
        data/prefix_data.pl
        perl/Version.pm
Please, commit your changes or stash them before you can merge.
Aborting

As I am very new to any Linux operating system I am still finding my way around but am stuck with the above error message
Any pointers?

73 Keith GB7DXG-1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.tobit.co.uk/pipermail/dxspider-support/attachments/20131202/5b3a61d3/attachment.html>