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

Example: show conflicts git

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