Explain 'Automatically resolve conflicts'
Explain 'Automatically resolve conflicts'

In the Gerrit documentation explain the project option 'Automatically
resolve conflicts'.

Change-Id: Ib43316092001d5f02ba68507c95c7bfd3ad049ce
Signed-off-by: Edwin Kempin <b444e279ad95fdef4fbdd82c813b624595df204a@sap.com>

dwhipstock/gerrit,anminhsu/gerrit,gerrit-review/gerrit,dwhipstock/gerrit,thinkernel/gerrit,netroby/gerrit,pkdevbox/gerrit,midnightradio/gerrit,Saulis/gerrit,ashang/aaron-gerrit,Team-OctOS/host_gerrit,m1kah/gerrit-contributions,quyixia/gerrit,MerritCR/merrit,bpollack/gerrit,dwhipstock/gerrit,GerritCodeReview/gerrit,atdt/gerrit,TonyChai24/test,bootstraponline-archive/gerrit-mirror,Overruler/gerrit,thinkernel/gerrit,basilgor/gerrit,dwhipstock/gerrit,hdost/gerrit,TonyChai24/test,WANdisco/gerrit,ckamm/gerrit,thinkernel/gerrit,Seinlin/gerrit,joshuawilson/merrit,Team-OctOS/host_gerrit,ashang/aaron-gerrit,CandyShop/gerrit,Team-OctOS/host_gerrit,jackminicloud/test,quyixia/gerrit,thinkernel/gerrit,qtproject/qtqa-gerrit,thesamet/gerrit,Distrotech/gerrit,teamblueridge/gerrit,TonyChai24/test,CandyShop/gerrit,evanchueng/gerrit,Overruler/gerrit,gcoders/gerrit,Overruler/gerrit,1yvT0s/gerrit,gcoders/gerrit,gcoders/gerrit,joshuawilson/merrit,renchaorevee/gerrit,Distrotech/gerrit,Team-OctOS/host_gerrit,basilgor/gerrit,ckamm/gerrit,anminhsu/gerrit,gerrit-review/gerrit,MerritCR/merrit,ckamm/gerrit,1yvT0s/gerrit,netroby/gerrit,zommarin/gerrit,m1kah/gerrit-contributions,pkdevbox/gerrit,ckamm/gerrit,jackminicloud/test,GerritCodeReview/gerrit,Team-OctOS/host_gerrit,Saulis/gerrit,atdt/gerrit,gracefullife/gerrit,basilgor/gerrit,joshuawilson/merrit,gracefullife/gerrit,bootstraponline-archive/gerrit-mirror,hdost/gerrit,thesamet/gerrit,thesamet/gerrit,gcoders/gerrit,CandyShop/gerrit,GerritCodeReview/gerrit,TonyChai24/test,Seinlin/gerrit,atdt/gerrit,midnightradio/gerrit,bootstraponline-archive/gerrit-mirror,keerath/gerrit_newssh,pkdevbox/gerrit,joshuawilson/merrit,anminhsu/gerrit,Saulis/gerrit,renchaorevee/gerrit,Seinlin/gerrit,TonyChai24/test,jackminicloud/test,thesamet/gerrit,MerritCR/merrit,CandyShop/gerrit,midnightradio/gerrit,WANdisco/gerrit,keerath/gerrit_newssh,bootstraponline-archive/gerrit-mirror,teamblueridge/gerrit,hdost/gerrit,GerritCodeReview/gerrit,keerath/gerrit_newssh,TonyChai24/test,m1kah/gerrit-contributions,qtproject/qtqa-gerrit,hdost/gerrit,supriyantomaftuh/gerrit,Team-OctOS/host_gerrit,WANdisco/gerrit,atdt/gerrit,gerrit-review/gerrit,GerritCodeReview/gerrit,quyixia/gerrit,gerrit-review/gerrit,Seinlin/gerrit,pkdevbox/gerrit,GerritCodeReview/gerrit,thesamet/gerrit,pkdevbox/gerrit,renchaorevee/gerrit,Saulis/gerrit,WANdisco/gerrit,Seinlin/gerrit,bpollack/gerrit,zommarin/gerrit,supriyantomaftuh/gerrit,Overruler/gerrit,bpollack/gerrit,m1kah/gerrit-contributions,netroby/gerrit,1yvT0s/gerrit,bpollack/gerrit,qtproject/qtqa-gerrit,qtproject/qtqa-gerrit,thesamet/gerrit,GerritCodeReview/gerrit,jackminicloud/test,quyixia/gerrit,renchaorevee/gerrit,anminhsu/gerrit,gcoders/gerrit,gerrit-review/gerrit,renchaorevee/gerrit,evanchueng/gerrit,hdost/gerrit,thinkernel/gerrit,MerritCR/merrit,Distrotech/gerrit,renchaorevee/gerrit,ckamm/gerrit,joshuawilson/merrit,netroby/gerrit,supriyantomaftuh/gerrit,Distrotech/gerrit,pkdevbox/gerrit,ashang/aaron-gerrit,joshuawilson/merrit,renchaorevee/gerrit,Seinlin/gerrit,basilgor/gerrit,gerrit-review/gerrit,netroby/gerrit,gcoders/gerrit,quyixia/gerrit,supriyantomaftuh/gerrit,gracefullife/gerrit,WANdisco/gerrit,GerritCodeReview/gerrit,zommarin/gerrit,bpollack/gerrit,supriyantomaftuh/gerrit,qtproject/qtqa-gerrit,gracefullife/gerrit,teamblueridge/gerrit,midnightradio/gerrit,jackminicloud/test,atdt/gerrit,MerritCR/merrit,dwhipstock/gerrit,Distrotech/gerrit,anminhsu/gerrit,quyixia/gerrit,supriyantomaftuh/gerrit,WANdisco/gerrit,Overruler/gerrit,hdost/gerrit,Saulis/gerrit,dwhipstock/gerrit,midnightradio/gerrit,basilgor/gerrit,joshuawilson/merrit,anminhsu/gerrit,keerath/gerrit_newssh,pkdevbox/gerrit,supriyantomaftuh/gerrit,bpollack/gerrit,MerritCR/merrit,Team-OctOS/host_gerrit,CandyShop/gerrit,ashang/aaron-gerrit,MerritCR/merrit,jackminicloud/test,dwhipstock/gerrit,teamblueridge/gerrit,thesamet/gerrit,zommarin/gerrit,teamblueridge/gerrit,netroby/gerrit,joshuawilson/merrit,zommarin/gerrit,qtproject/qtqa-gerrit,ashang/aaron-gerrit,keerath/gerrit_newssh,gcoders/gerrit,quyixia/gerrit,thinkernel/gerrit,Overruler/gerrit,TonyChai24/test,MerritCR/merrit,netroby/gerrit,Seinlin/gerrit,jackminicloud/test,Saulis/gerrit,gracefullife/gerrit,Distrotech/gerrit,bootstraponline-archive/gerrit-mirror,evanchueng/gerrit,bootstraponline-archive/gerrit-mirror,evanchueng/gerrit,anminhsu/gerrit,1yvT0s/gerrit,gerrit-review/gerrit,1yvT0s/gerrit,thinkernel/gerrit,evanchueng/gerrit,hdost/gerrit,qtproject/qtqa-gerrit,WANdisco/gerrit,midnightradio/gerrit,Distrotech/gerrit