27 Jan
2014
27 Jan
'14
7:27 p.m.
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: git stash then pull any updates: git pull then apply your local changes back on top of what you pulled: git stash apply Resolve if any conflicts occur during the stash apply. -- Noel