git diff shows no changes?

Sometimes git diff shows no changes, although you expected to see changes.

It is likely that your changes are already staged (for example you resolved a merge conflict).

Run git status to see if you have staged changes.

You need to use git diff --staged to see your changes.