title: Git switch to master and bring untracked files along
body: <p>While I was working on a feature_branch I ended up fixing a bug for the whole site. I want to commit the bug fix to master, not my feature_branch. The fix involved adding some new files so when I try to checkout master it aborts and warns me that the untracked files would be overwritten.</p>
  
  <p>How can I switch to master and bring untracked files with me?</p>