Stranded on Git without a branch
Flying by the seat of your pants on Git, I find myself without a branch for my just-committed changes. Getting back on was basically this:
git commit -a -m “commit merge with svn to head”
git checkout -b merged_with_svn
git checkout original_branch
git merge merged_with_svn
