git checkout master
git checkout -b featurebranch
*** make some new files ***
git add -A
git commit -am "funky stuff"
git push origin featurebranch
Someone updated master that caused a conflict for featurebranch so we can't merge so need to do a rebase