“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

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.