git list files with conflicts
git diff --name-only --diff-filter=U
This command will list out files that have a merge conflict. Run this command in your terminal to see the output of conflicting files.
Here is what the above code is doing:
1. First it runs the command "git diff --name-only --diff-filter=U"
2. It then pipes the output of that command into the command "wc -l", which counts the number of lines.
3. It then prints the output of that command
Snippet By Dev Dojo·
Created June 16th, 2022·