/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 vote127 views1 answer
My numpad stopped working in ubuntu
Shell/Bash
0 vote134 views1 answer
Minecarft night skip command
Shell/Bash
0 vote123 views2 answers
Mirror repository github
Shell/Bash
27 votes162 views3 answers
Yarn install specific version
Shell/Bash
26 votes138 views1 answer
How to remove git initialization
Shell/Bash
0 vote137 views1 answer
Cpanel install jpegoptim
Shell/Bash
9 votes151 views4 answers
Ubuntu generate ssh key
Shell/Bash
0 vote132 views1 answer
Shell script -z
Shell/Bash
0 vote150 views1 answer
List of full path of file in text file ubuntu
Shell/Bash
12 votes176 views3 answers
Ssh cp directory remote to local
Shell/Bash