The following code snippet represents the result of a merge conflict. Edit the code to fix the conflict and keep the version represented by the current branch. code example
Example 1: git find merge conflicts
git diff --name-only --diff-filter=U
Example 2: git Automatic merge failed; fix conflicts and then commit the result
$ git status
$ git add .
$ git commit -a "Comment"
Example 3: how to show code conflicts in git
$ git statusOn branch masterYou have unmerged paths.(fix conflicts and run "git commit")(use "git merge --abort" to abort the merge)Unmerged paths:(use "git add <file>..." to mark resolution)both modified: merge.txt