/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

4 votes292 views2 answers
Install nvm debian
Shell/Bash
1 vote257 views1 answer
How to enable gitlab runner to use local docker images
Shell/Bash
1 vote275 views1 answer
Access nodeport service from another machine in the same network
Shell/Bash
0 vote316 views1 answer
Linux history delete line
Shell/Bash
0 vote274 views1 answer
Sync branch with another branch
Shell/Bash
0 vote285 views1 answer
Github see when repo was created
Shell/Bash
2 votes258 views1 answer
Install pytorch lightning
Shell/Bash
2 votes267 views2 answers
Sudo systemctl restart networking
Shell/Bash
1 vote349 views1 answer
Github color
Shell/Bash
1 vote271 views1 answer
React-darkmode-toggler
Shell/Bash