Is there any way of simulating a git merge between two branches, the current working branch and the master, but without making any changes?
git merge
I often have
Why not just create a throwaway branch (git checkout -b), and do a test merge there?