Yes. Say you're in the master branch and you want to check a branch called 'feature' for conflicts. Do git merge feature --no-ff --no-commit. Once you have what you need, to get out of the state this puts git in, do git merge --abort.
git merge feature --no-ff --no-commit
git merge --abort
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.