Reputation: 6039
Before I start, I would like to say I am new to git.
Say I have the given scenario:
How do I get step 4 done?
Upvotes: 1
Views: 37
Reputation: 12837
git stash
- save your local changes asidegit pull
- pull the latest changesgit stash pop
- apply your local changes from the stackif you wan't to revert any of your local changes selectively, you can invoke git checkout $file
Upvotes: 1