title	tags

How to do a "dry run" of a git merge to see what would happen without actually committing to it.

Example: You're on a branch called some-branch and you want to see how your branch compares to your local dev branch.

1. First run a git diff to see the difference between your branches:

# git diff <other-branch> <current-branch>
$ git diff dev some-branch

git merge --no-commit --no-ff dev