title: Multiple merge conflict in Gerrit
body: <p>I am facing a problem in Gerrit. I am learning the Gerrit code review tool. I am using Windows.</p>
  
  <p>Let me tell you whole story what happened. So you can understand better.</p>
  
  <p>I have five commits in Gerrit. All are in merge conflict.</p>
  
  <p>We have two branch 
  One is master for reviewed code that is merged by Gerrit(I assume)
  Other is refs/for/master to review code from Gerrit.</p>
  
  <p>I had push privilege today for master branch. What I did I pushed some libraries and pom.xml into master branch(I know maven will fetch  dependencies from Central but These are custom one So I needed to push those with project in lib folder with system scope in pom.xml). After That I pushed  same libraries in Gerrit branch that is <code>refs/for/master</code>.</p>
  
  <p>I am attaching screenshot for the same.</p>
  
  <p><a href="https://i.stack.imgur.com/cKT9A.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/cKT9A.png" alt="Screenshot"></a></p>
  
  <p>Starting  two commits are merged. After that next commit(Retry commit) is showing merge conflict that has more than 100 files. </p>
  
  <p>Next commit was of Pom.xml (<strong>including tibco dependency as a part of classpath</strong>) that was of libraries dependency that I added having scope system So that Maven will pick those from project lib folder.</p>
  
  <p>After that next commit (<strong>addming file seperator in pom.xml to avoid conflict between windows/linux</strong>) is also in master branch. Some other use has committed. So his commit was  reviewed first and merged to master branch.</p>
  
  <p>After that next commit (**adding lib for tibco*) is already in master. As I said I pushed the some libraries into master branch directly.</p>
  
  <p>Next two commits(<strong>polish</strong>) are also in merge conflict because of two file(I assume). but has other files beside those that are different.</p>
  
  <p>How would I resolve this situation. How I can resolve merge conflict.</p>
  
  <p>Beside that I also want to know about <code>Abandon this change</code> button's significance. When we should use this?</p>
  
  <p>Any help would be appreciated.</p>