title: How to solve Gerrit's "Your change requires a recursive merge to resolve"
body: <p>I have the following open review in Gerrit:</p>
  <ul>
  <li><p>Change I37783be4</p>
  <p>depends on Change Iff96ca11 (MERGED)</p>
  </li>
  </ul>
  <p>Change I37783be4 it's depending on an already merged commit, so I would expect that Gerrit knows how to merge it into master. Still I do get the following error:</p>
  <p><strong>Your change requires a recursive merge to resolve.
  Please merge (or rebase) the change locally and upload the resolution for review.</strong></p>
  <p>I tried to fetch that specific changeId and do a 'git rebase master', but the only thing I get back is a sad &quot;Nothing to do&quot; message.</p>
  <p>Any ideas of what I'm doing wrong?</p>