git rebase and remove changes which are not present on branch code example
Example: which branch do I "rebase on"
$ git checkout experiment
$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: added staged command