3 ms·git status will tell you which files are conflicted.by mynameisvlad 12y agogit status will tell you which files are conflicted.