get old version of file to master git code example Example: Git command to check for any conflicts between new and old versions on your repository $ cat mars.txt