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>

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