title: "cannot pull into a repository with state: merging_resolved"
body: <p>After some pulling, merging and conflict resolving, my GIT is stuck. This is what I tried to do (with EGit) on the main project:</p>
  
  <ul>
  <li>"Pull" returns "cannot pull into a repository with state: merging_resolved"</li>
  <li>"Fetch from upstream" returns "No ref to fetch from GeniusWebSocket - origin - everything up to date."</li>
  <li>"Merge" is greyed in the menu.</li>
  <li>"Commit" returns "Commit/amend not possible...".</li>
  <li>"Push to upstream" returns "rejected - non-fast-forward".</li>
  <li>"Add to index" does nothing.</li>
  </ul>
  
  <p>Near the project title, I see [Merged master up-arrow 1 down-arrow 1].</p>
  
  <pre><code>$ git status
  # On branch master
  # Your branch and 'origin/master' have diverged,
  # and have 1 and 1 different commit each, respectively.
  #
  nothing to commit (working directory clean)
  </code></pre>
  
  <p>How can I proceed?</p>