Re: [boost] [align] git update problem

Subject: Re: [boost] [align] git update problem
From: Andrey Semashev (andrey.semashev_at_[hidden])
Date: 2014-06-27 12:41:17

On Friday 27 June 2014 15:52:51 Fletcher, John P wrote:
> I am attempting to update my local copy of boost develop, which I can
> usually do with the commands:
> 
> git checkout develop
> git pull --recurse-submodules
> git submodule update --init
> 
> and then
> 
> git submodule foreach git checkout develop
> git submodule foreach git pull
> 
> I have not done this for some time.
> 
> When I did it today I get a lot of messages from boost align with unmerged
> files and it will not update.  I have not worked on these files myself.
> 
> What do I need to do to get boost align restored to a good state?

I've seen this too. I solved this by doing:

git reset --hard origin/develop

in libs/align. Note this will reset your local history to correspond to the 
remote branch.

I'd really prefer we have a policy to not rewrite git history so that problems 
like this don't come up.