Question

I have started making some changes recently to my master branch to add featureX. I have created 1 new file and edited 6 others. I have not committed any of the changes. For the time being, I would like to work on featureX on a separate branch and leave the master untouched until I am sure featureX works correctly.

I know I should have started a new branch before I started making these changes for featureX, but is there anyway to get the uncommitted changes I’ve made to the master branch into a featureX branch and restore the master to its pre featureX state?

Answer 1

Creating a new branch (git checkout -b your_new_feature) should do the job – otherwise, you could try this:

git stash
git checkout -b your_new_feature
git stash apply