Just `git checkout scores && git rebase master`?