title: Push under same change id after merge conflict
body: <p>I am using <code>git</code> and <code>gerrit</code> for code reviews. After pushing a change with a unique <code>change id</code>, there was a merge conflict issue on <code>gerrit</code> dashboard. So I pulled code again, resolved the merge conflict and then decided to amend the changes under the same change id.  </p>
  
  <p>But <code>git</code> won't allow this. <code>Amend</code> cannot be done if there is a <code>merge conflict</code>. You have to do a separate commit.</p>
  
  <p>Is there any way to push my updated code under the same <code>change id</code>?</p>