[Dxspider-support] sh/qrz

[Dirk Koopman G1TLH]

Dave Kufta wrote:
> On Wednesday 25 November 2009 05:26:21 pm Dirk Koopman wrote:
>> After an excessively long wait I have modified the sh/qrz command to use
>> the xml interface of qrz.com. You will need a subscription for your node
>> to use it.
>>
>> See http://www.qrz.com/XML/index.html for details.
>>
>> This is available in git/cvs.
>>
>> Dirk G1TLH
>>
>> _______________________________________________
>> Dxspider-support mailing list
>> Dxspider-support at dxcluster.org
>> http://mailman.tobit.co.uk/mailman/listinfo/dxspider-support
>>
> Hi Dirk,
>  Thanks for the information. I just did git pull on dxspider, here are the 
> results:
> n3meq at n3meq spider]$ git pull
> remote: Counting objects: 30, done.
> remote: Compressing objects: 100% (18/18), done.
> remote: Total 18 (delta 16), reused 0 (delta 0)
> Unpacking objects: 100% (18/18), done.
>>From git://scm.dxcluster.org/scm/spider
>    47383be..bbb282d  master     -> origin/master
>    47383be..bbb282d  spider     -> origin/spider
> Updating 47383be..bbb282d
> error: Entry 'Changes' not uptodate. Cannot merge.
> 
> 	73,Dave [n3meq]

cd /spider
git reset --hard
git pull