/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 votes354 views2 answers
Grep in gz files
Shell/Bash
30 votes317 views2 answers
How to upgrade in linux
Shell/Bash
-1 vote349 views1 answer
Powershell allow execution
Shell/Bash
1 vote341 views1 answer
Sudo add permissions to user
Shell/Bash
0 vote381 views1 answer
Diff remote file
Shell/Bash
3 votes329 views2 answers
Install homebre windows
Shell/Bash
0 vote338 views2 answers
Sbatch cancel job
Shell/Bash
4 votes358 views2 answers
Push all branches to remote
Shell/Bash
1 vote331 views1 answer
Powershell grab regex
Shell/Bash
4 votes335 views3 answers
Apt install pycharm
Shell/Bash