How can I show only the files containing merge conflicts?

To show only the files containing merge conflicts in Git, you can use the git diff command with the --name-only and --diff-filter options.

Here's the command you can use:

git diff --name-only --diff-filter=U

Explanation:

--name-only: This option tells Git to output only the names of the files that have differences.
--diff-filter=U: This option tells Git to show only files with unmerged, or conflicted changes.

This command will output a list of file names that have conflicts. You can then use this list to resolve the conflicts in those files.

Susan Potter

Quant

Work with me

I spent the first half of my career building risk models and market data infrastructure at BNP Paribas, Bank of America, and Citadel, then fourteen years shipping production systems at scale. Now I bring both sides to quantitative trading. If you're a trading firm, family office, or fund looking to tighten the connection between your research ideas and your production trading systems, whether that's building validation pipelines, formalizing signal logic, or getting microstructure analytics into a deployable state, I'd like to hear what you're working on. Reach me at me@susanpotter.net.