SHELL

git CONFLICT (modify/delete)

$ git rm <filename>
$ git commit

git CONFLICT (modify/delete)

$ git checkout <filename>
$ git add <filename>
$ git commit

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