"cannot pull into a repository with state: merging_resolved"

I was facing the same problem . I did a project import in between of resolving conflicts that appeared after doing a pull.

I solved it by following steps: 1. Right click on repository and click on Reset 2. I selected a branch under Remote Tracking on which there was most recent changes 3. did a MIXED Reset Type

Finally, I got all the latest version with my changes in unstaged version.


Since you have finished your merge, and if you don't have any pending changes, you can try a git reset --hard, and see if the issue persists. (See EGit reset your current HEAD)


Ankit Marothi suggests in the comments:

I resolved it by resetting it from egit, using Team->Reset and using mixed reset as the option.

Tags:

Git

Merge

Egit