title: Automatically resolve merge conflicts
body: <p>I use git + Jenkins + gerrit. And how to automatically resolve merge conflicts? I always see status in webui "Submitted, Merge Pending". </p>
  
  <p>I tried all submit type: Fast-Forward, Merge if  necessary, Rebase if necessary, Always Merge, Cherry Pick. But no one doesn't solve this problem. I always see "Submitted, Merge Pending"</p>