/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 vote237 views1 answer
Libopusfile.so.0 terminal download
Shell/Bash
2 votes263 views1 answer
Move directories recursively linux
Shell/Bash
1 vote269 views2 answers
Install VirtualBox on ubuntu
Shell/Bash
0 vote257 views1 answer
Mirror Repository Ubuntu 19.10
Shell/Bash
0 vote242 views1 answer
Batch rename files fish
Shell/Bash
0 vote243 views1 answer
Linux search last commands
Shell/Bash
1 vote248 views2 answers
Git branch from commit
Shell/Bash
1 vote248 views2 answers
Java for ubuntu
Shell/Bash
0 vote229 views1 answer
Executar python como parametro
Shell/Bash
-2 votes241 views2 answers
Linux print system info
Shell/Bash