/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

2 votes144 views1 answer
List of previous commands
Shell/Bash
1 vote162 views1 answer
How to filter 12 character words from file bash
Shell/Bash
0 vote185 views1 answer
Powershell password encryption in script
Shell/Bash
0 vote135 views1 answer
Git checkout multiple branches at once
Shell/Bash
0 vote130 views1 answer
Add sudo user centos server group
Shell/Bash
0 vote206 views1 answer
Should: vs or: elasticsearch
Shell/Bash
0 vote162 views1 answer
Bash check return of command not error
Shell/Bash
2 votes149 views1 answer
Rsync progress bar
Shell/Bash
1 vote148 views1 answer
How to install kite in ubuntu
Shell/Bash
94 votes155 views6 answers
Git show remote url
Shell/Bash