$ git rm <filename>

$ git commit

​

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

$ git checkout <filename>

$ git add <filename>

$ git commit

​

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

​

If you want to push after

$ git pull <branch> <repository-name> <branch> #check if it is up to date?

$ git push <repository-name>