Susan Potter
git:

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:

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.

If you enjoyed this content, please consider sharing this link with a friend, following my GitHub, Twitter/X or LinkedIn accounts, or subscribing to my RSS feed.