Auto-merging .gitignore CONFLICT (content): Merge conflict in .gitignore Automatic merge failed; fix conflicts and then commit the result. code example

Example: show conflicts git

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