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 commitgit 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 commitgit CONFLICT (modify/delete)
$ git rm <filename>
$ git commitgit CONFLICT (modify/delete)
$ git checkout <filename>
$ git add <filename>
$ git commitgit 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 commitgit CONFLICT (modify/delete)
$ git rm <filename>
$ git commitgit CONFLICT (modify/delete)
$ git checkout <filename>
$ git add <filename>
$ git commitCopyright © 2021 Codeinu
Forgot your account's password or having trouble logging into your Account? Don't worry, we'll help you to get back your account. Enter your email address and we'll send you a recovery link to reset your password. If you are experiencing problems resetting your password contact us
