/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

0 vote147 views1 answer
One liner powershell download file
Shell/Bash
0 vote160 views1 answer
Install homebrew package manager for ubuntu and depian based systems
Shell/Bash
0 vote132 views1 answer
Unzip all files in a directory linux
Shell/Bash
0 vote177 views4 answers
Cleaning up your ubuntu system
Shell/Bash
1 vote124 views1 answer
Find npmrc file ubuntu
Shell/Bash
0 vote123 views1 answer
Install realsense viewer in jetson nano
Shell/Bash
0 vote140 views1 answer
How to use tags in ansible
Shell/Bash
4 votes130 views1 answer
Amazon Linux 2 AMI install docker
Shell/Bash
0 vote279 views1 answer
How to move git clone to another git repo
Shell/Bash
0 vote129 views1 answer
Linux command line search file by size
Shell/Bash