Question

I’m currently working on multiple changes/bugs and I would like to be able to work on these individually using individual local branches. But when I am in the middle of working on something on for example branch_a and then I need to start work on a new hot project, and I create a branch_b, I still have the changes that I made from branch_a.

Here is the workflow:

1. Created and checked-out local branch_a from dev branch
2. Made local changes to branch_a (but no staging via git add or commits locally)
3. Needed to start on a new hot bug so switched to dev branch, and created and checked-out branch_b
4. Perform a git status and I see the changes I made on branch_a

How do I create a new branch that doesn’t have the changes I made on branch_a?

Also, when I checkout another branch I get

$ git checkout branch_b
M   app/controllers/stuff.rb
M   app/views/stuff/index.html.erb
Switched to branch 'branch_b'

What does the M represent?

Thanks

Answer 1

The M means modified. First you have to commit your changes to your current branch or stash them.

When you want to stash them:

git add .
# temporary stash your changes
git stash
# create a new branch
git checkout -b branch_b
# do your changes
git commit -am 'fixed but in branch_b'
# go back to branch a
git checkout branch_a
# get back your stash
git stash pop

When you choose to commit your changes:

git add .
git commit -am 'changes in branch_a'
# creating and checkout new branch
git checkout -b branch_b
# fix your bug
git add .
git commit -am 'just fixed a bug'