error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree,
git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use ‘git add/rm ’
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
出现这个错…