<div dir="ltr">Luigi, look at the file /spider/UPGRADE.mojo, at the end you have the git command sequence.<br><br>Good luck.<br><div><br></div><div>Kin EA3CV</div><div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">El dom., 7 jun. 2020 a las 18:38, IK5ZUK Luigi via Dxspider-support (<<a href="mailto:dxspider-support@tobit.co.uk">dxspider-support@tobit.co.uk</a>>) escribió:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello all,<br>
doing "git pull" I've received the following:<br>
<br>
sysop@server:/spider$ git pull<br>
Aggiornamento di 77592822..e884309a<br>
error: Your local changes to the following files would be overwritten by <br>
merge:<br>
         data/<a href="http://prefix_data.pl" rel="noreferrer" target="_blank">prefix_data.pl</a><br>
         perl/Console.pm<br>
         perl/DXSql.pm<br>
         perl/Prefix.pm<br>
         perl/RBN.pm<br>
Please commit your changes or stash them before you merge.<br>
Aborting<br>
sysop@server:/spider$<br>
<br>
What's happening ? Any help ?<br>
<br>
73 Luigi IK5ZUK<br>
<br>
-- <br>
Luigi - IK5ZUK<br>
Qth: Pisa<br>
Locator: JN53FQ<br>
Mail: ik5zuk at <a href="http://tiscali.it" rel="noreferrer" target="_blank">tiscali.it</a><br>
<br>
<br>
_______________________________________________<br>
Dxspider-support mailing list<br>
<a href="mailto:Dxspider-support@tobit.co.uk" target="_blank">Dxspider-support@tobit.co.uk</a><br>
<a href="https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support" rel="noreferrer" target="_blank">https://mailman.tobit.co.uk/mailman/listinfo/dxspider-support</a><br>
</blockquote></div>