[Dxspider-support] Update

[Dirk Koopman G1TLH]

On 17/06/10 16:21, Peter wrote:
> Hi
>
> Just tried to do an update, but got an error. See below:
>
> Hello Peter, this is PI4CC in Rotterdam area
> running DXSpider V1.55 build 0.69
>
>  From the console:
> sysop at pi4cc:~$ cd /spider/
> sysop at pi4cc:/spider$ git pull
> Updating ddf9f90..537a4a1
> Changes: needs update
> cmd/clear/cmd_cache.pl: needs update
> data/cty.dat: needs update
> data/prefix_data.pl: needs update
> gcommit: needs update
> perl/DXProt.pm: needs update
> perl/Version.pm: needs update
> error: Entry 'Changes' not uptodate. Cannot merge.
> sysop at pi4cc:/spider$
>

git reset --hard

then

git pull

Although I might like to know what you have done to clear/cmd_cache and 
DXProt.pm :-)

You are on the master branch?

git branch

should yield a '*' next to master as in:

djk at dirk5:/spider/perl$ git branch
   1.53
   ip_address
* master
   wpxloc.dat

Dirk