Seems like you want to rebase your demo branch from the master branch.
use this command to rebase:
git rebase origin/master
This is what rebasing does.
Rebasing will keep the changes made in your demo branch while adding all the changes you've made to the master ever since you branched out from it.