CODE EXAMPLE FOR SHELL

git CONFLICT (modify/delete)

$ git rm <filename>
$ git commit