Git “error: The branch 'x' is not fully merged”

Question

Here are the commands I used from the master branch

git branch experiment
git checkout experiment

Then I made some changes to my files, commi

Answer 1

to see changes that are not merged, I did this:

git checkout experiment
git merge --no-commit master

git diff --cached

Note: This shows changes in master that are not in experiment.

Don't forget to:

git merge --abort

When you're done lookin.