/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

1 vote90 views1 answer
Kube delete cronjob
Shell/Bash
4 votes71 views2 answers
Copy main branch to another branch
Shell/Bash
0 vote91 views1 answer
Installing mailcatcher ubuntu
Shell/Bash
18 votes95 views4 answers
Git remove cache
Shell/Bash
2 votes95 views1 answer
Cmd check if file exists or not
Shell/Bash
0 vote96 views1 answer
Zsh read user input
Shell/Bash
8 votes64 views1 answer
Npm does not support node.js v16
Shell/Bash
0 vote93 views1 answer
Remove .idea from git
Shell/Bash
7 votes100 views2 answers
Git untracked folder
Shell/Bash
0 vote106 views1 answer
Open firewall port ubuntu 16.04
Shell/Bash