git cannot squash commits

Question

I cannot squash commits with git rebase -i command, getting the following error message.

error: could not apply 3ad5c7b... 

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".

What is the error and how to resolve it?

Solution

Git failed to merge automatically. Try git mergetool and resolve conflicts, then continue your rebase with git rebase --continue

Comments

[William Seiti Mizuta]

When you typed __git_ps1, what did you get?