Subject: Re: [boost] [EXTERNAL] [git][predef] Pull fails
From: Belcourt, Kenneth (kbelco_at_[hidden])
Date: 2014-01-27 14:27:35
On Jan 27, 2014, at 3:51 AM, Peter Dimov wrote:
> Andrey Semashev wrote:
>> What do you do when you want to update the repository when you have local changes?
> I guess I don't do that - I always commit first. I'm sure there is a way to do it, but I keep away from any git corner cases. :-)
First, stash your local changes:
then pull any updates:
then apply your local changes back on top of what you pulled:
git stash apply
Resolve if any conflicts occur during the stash apply.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk