title: Git and working on multiple branches
body: <p>I have a couple of Git branches: 'experimental', 'something' and 'master'.</p>
  
  <p>I switched to the 'experimental' branch. I noticed a bug which is unrelated to 'experimental' and belongs to changes which have been made in 'something'. How should I fix it?</p>
  
  <p>I'm thinking I should switch to 'something', fix the bug, commit and then move back to 'experimental'. How should I take the minor change from 'something' and apply it to both 'master' and 'experimental' so that I don't have to re-fix the bug again when I switch into these branches?</p>