How to do a re-merge into another branch in git

Question

I am working on a demo branch in git but whenever I try to merge it with the master its says it's already up to date. Then if I do a git diff it shows that a lot of files are different.

I want to re-merge master into demo, while keeping the changes which I've made in the demo branch, merging the files that I've changed in master.

Answer 1

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.