When you pull from a remote repository, the number of new files listed can sometimes cause conflict messages to get scrolled off the screen. Not very convenient. You can use the following command to get a quick list of conflicts from Git:
git ls-files -u
