“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

If working in eclipse IDE. goto -> Git Staging view -> commit & push, if you see there is a commit message already.

If you don't see any commit message there, synchronize your repository and go back to check it again.