fatal: git-write-tree: error building trees

Question

I did a git pull from a shared git repository, but something went really wrong, after I tried a git revert. Here is the situation now:

Answer 1

This happened for me when I was trying to stash my changes, but then my changes had conflicts with my branch's current state.

So I did git reset --mixed and then resolved the git conflict and stashed again.