/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

10 votes347 views1 answer
Excluir repositorio git local
Shell/Bash
0 vote362 views1 answer
How to force remove a directory in kali linux
Shell/Bash
22 votes391 views3 answers
Linux ram size
Shell/Bash
0 vote327 views1 answer
Laravel 4 installer
Shell/Bash
0 vote321 views1 answer
Exception: Error running pod install
Shell/Bash
0 vote311 views1 answer
Linssid linux mint 20
Shell/Bash
1 vote342 views1 answer
Widget tweaks django install
Shell/Bash
1 vote316 views1 answer
How to remove folder in terminal linux
Shell/Bash
0 vote348 views3 answers
Uninstall mongo db
Shell/Bash
0 vote349 views1 answer
Git change commit id email
Shell/Bash