CONFLICT (modify/delete) versions code example
Example 1: git CONFLICT (modify/delete)
If you want to keep the file
$ git checkout <filename>
$ git add <filename>
$ git commit
If you want to discard the file
$ git rm <filename>
$ git commit
Example 2: git CONFLICT (modify/delete)
$ git rm <filename>
$ git commit