[Dxspider-support] CTY-2006 Country Files - 04 October 2010

[Bob Nielsen]

That worked--thanks.

On Oct 4, 2010, at 7:18 PM, Jim Reisert AD1C wrote:

> Try removing spider/data/wpxloc.raw and do the git update again.
> 
> On 10/4/2010 6:46 PM, Bob Nielsen wrote:
>> I get an error:
>> 
>> ~/spider$ git pull
>> remote: Counting objects: 19, done.
>> remote: Compressing objects: 100% (11/11), done.
>> remote: Total 11 (delta 7), reused 0 (delta 0)
>> Unpacking objects: 100% (11/11), done.
>>> From git://scm.dxcluster.org/scm/spider
>>    537a4a1..2a187a4  master     ->  origin/master
>>    537a4a1..2a187a4  spider     ->  origin/spider
>> Updating 537a4a1..2a187a4
>> error: Entry 'data/wpxloc.raw' not uptodate. Cannot merge.
> 
> -- 
> Jim Reisert AD1C, <jjreisert at alum.mit.edu>, http://www.ad1c.us