How to locate merge conflicts

How do I find all of the files with merge conflicts in them?

I did the thing that Prof Challen said not to:
git pull staff master
git add .

I found one file with some

but I think there are more files.

How do I find them? or should I revert the changes and try again?

Also, if your goal is just to find the files that have merge conflicts, this information is provided by the git status command.

Yes… but not after you run git add . :expressionless: