/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

3 votes155 views1 answer
Install python math library
Shell/Bash
0 vote202 views1 answer
Ubuntu 18.04 create folders in dock
Shell/Bash
4 votes174 views2 answers
Git ignore cache
Shell/Bash
0 vote150 views2 answers
How to create a username along with home directory in linux
Shell/Bash
24 votes160 views3 answers
Shell logical and for file existence
Shell/Bash
1 vote144 views1 answer
Powershell progress bar
Shell/Bash
0 vote187 views1 answer
Solidity optimizer runs
Shell/Bash
-1 vote184 views1 answer
Installing android studio on kali linux
Shell/Bash
0 vote162 views1 answer
Bluetooth software for linux
Shell/Bash
5 votes156 views3 answers
Git remove cached directory
Shell/Bash