Git command to check for any conflicts between new and old versions on your repository? code example

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

$ cat mars.txt