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

Example 1: git find merge conflicts

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

Example 2: what is merge conflict in git

A merge conflict is an event that occurs when Git is unable to
automatically resolve differences in code between two commits.
When all the changes in the code occur on different lines or in
different files, Git will successfully merge commits without
your help