Subject: Re: [boost] merging the super-project
From: Peter Dimov (lists_at_[hidden])
Date: 2014-07-16 15:57:38
Daniel James wrote:
> Cherry picking should work. It's hard to tell what the issue with local
> changes is without seeing what they actually are.
I sometimes get inexplicable local changes when the branch has been
force-pushed. git reset --hard origin/master fixes it (assuming git checkout
master).