[Dxspider-support] error updating cluster

[Dirk Koopman]

Jan

Have you changed any of these files?

If you have we need to chat offline. If you haven't then (FAQ):

cd /spider
git reset --hard
git pull

and it should all just work.

Dirk

On 14/09/13 19:46, Jan wrote:
> Hello
> I would like to do an update for the spider cluster.
> I did git pull but at the end I got
> /error: Your local changes to the following files would be overwritten
> by merge://
> //        Changes//
> //        cmd/Commands_en.hlp//
> //        cmd/blank.pl//
> //        cmd/show/425.pl//
> //        cmd/show/contest.pl//
> //        cmd/show/db0sdx.pl//
> //        cmd/show/ik3qar.pl//
> //        cmd/show/muf.pl//
> //        cmd/show/qrz.pl//
> //        cmd/show/satellite.pl//
> //        cmd/show/time.pl//
> //        cmd/show/wm7d.pl//
> //        data/cty.dat//
> //        data/prefix_data.pl//
> //        data/wpxloc.raw//
> //        perl/DXChannel.pm//
> //        perl/DXCommandmode.pm//
> //        perl/DXUtil.pm//
> //        perl/Internet.pm//
> //        perl/Messages//
> //        perl/Msg.pm//
> //        perl/Sun.pm//
> //        perl/Version.pm//
> //Please, commit your changes or stash them before you can merge.//
> //Aborting/
>
> How to commit the changes osr stash them? I don't know what stash means.
>
> Please some help
>
> 73
> Jan
>
>
>
>
> _______________________________________________
> Dxspider-support mailing list
> Dxspider-support at dxcluster.org
> http://mailman.tobit.co.uk/mailman/listinfo/dxspider-support
>