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:

  • --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.