/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 votes200 views1 answer
Format pendrive linux
Shell/Bash
0 vote205 views1 answer
Sourcetree permission denied (publickey) github mac
Shell/Bash
1 vote201 views1 answer
Raspberry add-apt-repository command not found
Shell/Bash
38 votes212 views6 answers
Show directory size linux
Shell/Bash
0 vote218 views1 answer
To permanently fix this problem, please run: npm ERR! sudo chown -R 1000:1000
Shell/Bash
2 votes286 views3 answers
Add colab to github
Shell/Bash
0 vote210 views1 answer
Ansible run a task always at the end
Shell/Bash
1 vote196 views1 answer
What is bash
Shell/Bash
-1 vote221 views1 answer
Git log show last 3 commits
Shell/Bash
0 vote233 views1 answer
Install dependencies and devDependencies at same time
Shell/Bash