## View all the merge conflicts: git diff ## View the conflicts against the base file: git diff --base <filename> ## Preview changes, before merging: git diff <sourcebranch> <targetbranch>