[Dxspider-support] error updating cluster
Jan
cluster at pa4jj.nl
Sat Sep 14 19:46:31 BST 2013
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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.tobit.co.uk/pipermail/dxspider-support/attachments/20130914/9223e666/attachment.html>
More information about the Dxspider-support
mailing list