merge

Will this merge conflict? Find out without merging

git merge-tree does the whole merge in memory and names every file that would conflict — without touching your working tree, your index, or your branch.