Get the latest changes

git checkout master # there should not be any other branches you care about at this stage
git pull
git checkout -b ... # continue as above