Failing to pull latest source from Git

This is the message I get :

" It seems that I cannot create a rebase-apply directory, and I wonder if you are in the middle of patch application or another rebase. If that is not the case, please rm -fr /Users/tom/Documents/Source/mediaplayer2 copy/.git/rebase-apply and run me again. I am stopping in case you still have something valuable there."

The only thing I d开发者_Go百科id prior was to stage and commit. Don't think I rebased anything.

How do I fix that ? it happened to me couple of times already.

Thanks

---

It may happen if you did git pull --rebase, it failed (with conflict) and you did neither git rebase --continue after fixing the conflicts nor git rebase --abort to clean it up. If you recovered via other means (like git reset or something), the rebase is still open, but most operations don't do anything with it, so they didn't complain.