[Dxspider-support] git pull update

[Dirk Koopman G1TLH]

git reset --hard
git pull

ddm at lnx-vk7hdm.dnsalias.org wrote:
> Hi Group,
> 
> I am just on my lunch break at work and wanted to make sure my dxspider
> was up to date.
> So I logged into my server using ssh and tried a git pull as sysop in the
> spider directory and received this back.
> 
> 
> Updating 6650170..c20c796
> error: Entry 'changes' not uptodate. Cannot merge.
> 
> 
> Any Ideas or is it beacuse I have logged in remote from work and trying to
> update.
> 
> Thank you
> Best Regards
> Danny Moss
> VK7HDM
> 
> 
> 
> _______________________________________________
> Dxspider-support mailing list
> Dxspider-support at dxcluster.org
> http://mailman.tobit.co.uk/mailman/listinfo/dxspider-support
>