how to check for conflicts in git code example

Example 1: show conflicts git

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

Example 2: 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 ..." to mark resolution)both modified:   merge.txt

Example 3: Git command to check for any conflicts between new and old versions on your repository

$ cat mars.txt