/Shell/Bash/Git CONFLICT (modify/delete)

Git CONFLICT (modify/delete)

$ git rm <filename>
$ git commit

Source: stackoverflow.com

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

Git CONFLICT (modify/delete)

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

Source: stackoverflow.com

Similar codes

0 vote226 views2 answers
List des group linux
Shell/Bash
2 votes196 views6 answers
Anydesk: error while loading shared libraries: libpangox-1.0.so.0: cannot open shared object file: no such file or directory
Shell/Bash
18 votes214 views6 answers
Git restore
Shell/Bash
3 votes204 views1 answer
Pacman remove unused dependencies
Shell/Bash
0 vote206 views1 answer
How to copy my pub ssh key to server linux
Shell/Bash
0 vote209 views1 answer
Bash grep all after match
Shell/Bash
0 vote224 views1 answer
Texlive 2019 in ubuntu 18.4
Shell/Bash
1 vote197 views1 answer
Portainer install ubuntu
Shell/Bash
4 votes220 views4 answers
Git remove from history
Shell/Bash
1 vote210 views1 answer
Shopify theme kit for linux
Shell/Bash