how to check git conflicts between versions code example

Example 1: show conflicts git

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

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

$ cat mars.txt