Re: [boost] [git] The any library does not pull cleanly because of a forced update on develop and master.

Subject: Re: [boost] [git] The any library does not pull cleanly because of a forced update on develop and master.
From: Antony Polukhin (antoshkka_at_[hidden])
Date: 2013-12-10 02:37:37

2013/12/10 Cox, Michael <mhcox_at_[hidden]>

> I tried to update my local repositories to the latest changes in each
> submodule:
>
>      git pull; git submodule foreach --recursive git pull
>
> When it got to the libs/any submodule, I got the following message:
>

You'll be getting the same messages during pull of conversion, variant,
circular_buffer libraries. *If there is no changes in your local repo that
must be saved*, you can try the following:
http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull

As I understand, command to do so for all submodules will be (!removes all
local changes!):

git submodule foreach --recursive 'git checkout develop && git fetch --all
&& git reset --hard origin/develop && git checkout master && git fetch
--all && git reset --hard origin/master'

Sorry for the inconvenience caused.

-- 
Best regards,
Antony Polukhin