Cannot checkout, file is unmerged Cannot checkout, file is unmerged git git

Cannot checkout, file is unmerged


If you want to discard modifications you made to the file, you can do:

git reset first_Name.txtgit checkout first_Name.txt


To remove tracked files (first_file.txt) from git:

git rm first_file.txt

And to remove untracked files, use:

rm -r explore_california


status tell you what to do.

Unmerged paths:  (use "git reset HEAD <file>..." to unstage)  (use "git add <file>..." to mark resolution)

you probably applied a stash or something else that cause a conflict.

either add, reset, or rm.