show all of current conflict on git
git diff --name-only --diff-filter=Ushow all of current conflict on git
git diff --name-only --diff-filter=UGit command to check for any conflicts between new and old versions on your repository
$ cat mars.txtCopyright © 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
