Question

I’m trying to get the last version of the master code on my local machine without deleting any current work that’s being done in the later part of the tree. How do I accomplish this in git?

I want my local machine to have the code at the ‘new items’ version without deleting those changes that are happening in the master version above it.

Answer 1

Close any open editors that will complain if you change files out from under them.

Stash changes (in files Git is tracking) since the last commit:

git stash

Checkout the commit made before the last commit on the master branch:

git checkout master^

Done!

To get back to where you started:

git checkout master
git stash pop

Check out this awesome Git book.