git checkout -b sprint-11-b
git add .
git commit -m "xx"
git checkout master
git merge sprint-11-b

when I did that, it says master up-to-date
instead of actually merging
so I am guessing something went wrong when I was committing it