[Dxspider-support] CTY-2103 Country Files - 01 March 2011
Bob Nielsen
n7xy at clearwire.net
Wed Mar 2 02:05:50 GMT 2011
On Mar 1, 2011, at 5:28 PM, Jim Reisert AD1C wrote:
> On Tue, Mar 1, 2011 at 5:53 PM, Bob Nielsen <n7xy at clearwire.net> wrote:
>
>> ~/spider$ git pull
>> remote: Counting objects: 11, done.
>> remote: Compressing objects: 100% (6/6), done.
>> remote: Total 6 (delta 5), reused 0 (delta 0)
>> Unpacking objects: 100% (6/6), done.
>> From git://scm.dxcluster.org/scm/spider
>> 7109670..171a936 master -> origin/master
>> 7109670..171a936 spider -> origin/spider
>> Updating 7109670..171a936
>> error: Entry 'data/cty.dat' not uptodate. Cannot merge.
>
> Remove the old dat/cty.dat then "git pull" again.
Thanks. I also had to remove data/prefix_data.pl and then it worked.
Bob N7XY
More information about the Dxspider-support
mailing list