I've got strange error when I run cherry-pick.
While cherry-picking I ran into the conflict error.
Usually, I can find unmerged files when I run git status.
But there is no unmerged files.
I can find strange files when I run git status like below.
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
# test.conf~4f8a191... this is config file.
How can I resolve problem?
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.