“cannot pull into a repository with state: merging_resolved”

Question

After some pulling, merging and conflict resolving, my GIT is stuck. This is what I tried to do (with EGit) on the main project:

• \"Pull\" returns \"cannot pull int

Answer 1

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.