After fixing conflicts git still complains?

Question

I usually rebase when I pull in changes from my teammates, and often time I have conflicts:

...
CONFLICT (content): Merge conflict in app/views/sear         


        

Answer 1

I found myself in the same boat and git rebase --continue didn't help. Running rm -fr .git/rebase-apply fixed the issue though