Git and working on multiple branches

Question

I have a couple of Git branches: \'experimental\', \'something\' and \'master\'.

I switched to the \'experimental\' branch. I noticed a bug which is unrelated to \'e

Answer 1

you could:

• stash or commit the changes you have been working on the experimental branch
• checkout something
• (optional) bisect to find the bug
• commit the changes
• checkout experimental

and then:

• rebase something if you want a clean commit graph (if you expose this repository and you care about that)

or:

• merge something if you don't care about 'presentation' :)