[Dxspider-support] Git Error Help Please

Keith Le Boutillier KeithL at lebs.org.uk
Tue Dec 3 22:54:12 GMT 2013


Hi Dirk

Many thanks that did the trick

73 Keith 

-----Original Message-----
From: dxspider-support-bounces at dxcluster.org [mailto:dxspider-support-bounces at dxcluster.org] On Behalf Of Dirk Koopman
Sent: 03 December 2013 22:46
To: The DXSpider Support list
Subject: Re: [Dxspider-support] Git Error Help Please

Just back from Berlin:

git reset --hard
git pull

Dirk

On 03/12/13 09:10, Keith Le Boutillier wrote:
> Hi Jim
>
> Tried your suggestion but now get the error
>
> sysop at raspberrypi /spider $ git pull
>
> Updating 9e086e9..e0529a0
> error: Your local changes to the following files would be overwritten by merge:
>          Changes
> Please, commit your changes or stash them before you can merge.
> Aborting
> sysop at raspberrypi /spider $
>
> Still at a loss as to what is going on
>
> 73 Keith GB7DXG-1
>
> -----Original Message-----
> From: jjreisert at gmail.com [mailto:jjreisert at gmail.com] On Behalf Of 
> Jim Reisert AD1C
> Sent: 03 December 2013 02:19
> To: The DXSpider Support list; Keith Le Boutillier
> Subject: Re: [Dxspider-support] Git Error Help Please
>
> On Mon, Dec 2, 2013 at 3:43 PM, Keith Le Boutillier <KeithL at lebs.org.uk> wrote:
>
>> 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.
>
> Just remove the three files, and perform the update again. They will be replaced, instead of merged.
>
> --
> Jim Reisert AD1C, <jjreisert at alum.mit.edu>, http://www.ad1c.us
>
> _______________________________________________
> Dxspider-support mailing list
> Dxspider-support at dxcluster.org
> http://mailman.tobit.co.uk/mailman/listinfo/dxspider-support
>


_______________________________________________
Dxspider-support mailing list
Dxspider-support at dxcluster.org
http://mailman.tobit.co.uk/mailman/listinfo/dxspider-support



More information about the Dxspider-support mailing list