/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

3 votes303 views1 answer
Shell script function debug
Shell/Bash
8 votes349 views1 answer
Find text in any file linux
Shell/Bash
0 vote394 views1 answer
Docker fatal: Not a git repository (or any of the parent directories): .git
Shell/Bash
1 vote371 views3 answers
Restart nginx in mac
Shell/Bash
0 vote321 views1 answer
Path configuration cmd
Shell/Bash
1 vote388 views1 answer
Revert to master origin branch git
Shell/Bash
0 vote402 views1 answer
Install dbeaver using snap
Shell/Bash
2 votes384 views2 answers
Find total commit in git by specific user
Shell/Bash
0 vote357 views2 answers
Xargs ffmpeg multiples files
Shell/Bash
2 votes435 views2 answers
Set zsh as default shell
Shell/Bash