/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 vote315 views2 answers
Grep exclude file extension
Shell/Bash
0 vote347 views1 answer
Quasar install
Shell/Bash
2 votes305 views1 answer
Adding jars to classpath in linux
Shell/Bash
3 votes344 views1 answer
Cp folders
Shell/Bash
1 vote307 views2 answers
Bash check if string in file
Shell/Bash
2 votes347 views1 answer
Scp copy file from server
Shell/Bash
1 vote329 views2 answers
Ubuntu epub reader
Shell/Bash
0 vote316 views1 answer
“Permission denied while trying to connect to the Docker daemon socket” while accessing docker image on jenkins
Shell/Bash
2 votes345 views2 answers
Install metasploitable on ubuntu
Shell/Bash
-3 votes346 views3 answers
Install wsl2 windows 10 pro
Shell/Bash