List Conflicted files with Git

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


We moved off of Disqus for data privacy and consent concerns, and are currently searching for a new commenting tool.

Contact Us

We'd love to hear from you. Get in touch!


P.O. Box 961436
Boston, MA 02196