Add test for patch+conflicts
Add test for patch+conflicts

ryanj/origin,mdshuai/origin,rhcarvalho/origin,maxamillion/origin,openshift/origin,hferentschik/origin,chmouel/origin,markllama/origin,childsb/origin,jpeeler/origin,pweil-/origin,jdnieto/origin,miminar/origin,imcsk8/origin,wjiangjay/origin,jeffvance/origin,sgallagher/origin,inlandsee/origin,sjug/origin,hferentschik/origin,stevekuznetsov/origin,liangxia/origin,rhuss/origin,aveshagarwal/origin,stackdocker/origin,jeremyeder/origin,linearregression/origin,PI-Victor/origin,wjiangjay/origin,louyihua/origin,gabemontero/origin,maxamillion/origin,Miciah/origin,arilivigni/origin,dobbymoodge/origin,ravisantoshgudimetla/origin,sdminonne/origin,pecameron/origin,sg00dwin/origin,mdshuai/origin,maleck13/origin,jwforres/origin,marun/origin,stackdocker/origin,willmtemple/origin,tnozicka/origin,robertol/origin,pravisankar/origin,danwinship/origin,willmtemple/origin,juanvallejo/origin,rhamilto/origin,csrwng/origin,imcsk8/origin,akram/origin,php-coder/origin,matthyx/origin,maxamillion/origin,jeremyeder/origin,kargakis/origin,ravisantoshgudimetla/origin,stevekuznetsov/origin,dobbymoodge/origin,bparees/origin,coreydaley/origin,tracyrankin/origin,mahak/origin,raffaelespazzoli/origin,bparees/origin,ncdc/origin,mfojtik/origin,gruiz17/origin,eparis/origin,linzhaoming/origin,chmouel/origin,ryanj/origin,PI-Victor/origin,ncdc/origin,matthyx/origin,PI-Victor/origin,sg00dwin/origin,adelton/origin,enj/origin,kargakis/origin,liggitt/origin,childsb/origin,danwinship/origin,rhuss/origin,ironcladlou/origin,marun/origin,abutcher/origin,legionus/origin,sgallagher/origin,ironcladlou/origin,detiber/origin,rrati/origin,hferentschik/origin,jpeeler/origin,nak3/origin,dcbw/origin,luciddreamz/origin,dmage/origin,asiainfoLDP/datafactory,anpingli/origin,mkumatag/origin,liggitt/origin,rootfs/origin,imcsk8/origin,dinhxuanvu/origin,dgoodwin/origin,wanghaoran1988/origin,luciddreamz/origin,robertol/origin,sallyom/origin,danmcp/origin,aveshagarwal/origin,tagoh/origin,JacobTanenbaum/origin,detiber/origin,rhamilto/origin,kargakis/origin,ryanj/origin,dobbymoodge/origin,goern/origin,ncdc/origin,openshift/origin,jsafrane/origin,stackdocker/origin,markllama/origin,inlandsee/origin,pweil-/origin,inlandsee/origin,jwforres/origin,deads2k/origin,jwforres/origin,ingvagabund/origin,fabianofranz/origin,jwhonce/origin,zhaosijun/origin,tnozicka/origin,louyihua/origin,liggitt/origin,dmage/origin,deads2k/origin,willmtemple/origin,dgoodwin/origin,jwhonce/origin,tagoh/origin,mdshuai/origin,rrati/origin,PI-Victor/origin,mrogers950/origin,miminar/origin,danmcp/origin,rhcarvalho/origin,miminar/origin,rhamilto/origin,php-coder/origin,thrasher-redhat/origin,chlunde/origin,coreydaley/origin,adelton/origin,dcbw/origin,louyihua/origin,rhamilto/origin,sferich888/origin,sdminonne/origin,dgoodwin/origin,tracyrankin/origin,rhamilto/origin,arilivigni/origin,knobunc/origin,hroyrh/origin,tagoh/origin,mdshuai/origin,ravisantoshgudimetla/origin,ingvagabund/origin,asiainfoLDP/datafactory,fabianofranz/origin,legionus/origin,jpeeler/origin,pmorie/origin,nhr/origin,akram/origin,jprukner/origin,dgoodwin/origin,jprukner/origin,php-coder/origin,marun/origin,gabemontero/origin,jdnieto/origin,ravisantoshgudimetla/origin,gruiz17/origin,jim-minter/origin,mahak/origin,tnozicka/origin,jprukner/origin,mfojtik/origin,childsb/origin,juanvallejo/origin,coreydaley/origin,rhcarvalho/origin,ryanj/origin,stackdocker/origin,rajatchopra/origin,danwinship/origin,linearregression/origin,mahak/origin,pmorie/origin,chlunde/origin,thrasher-redhat/origin,childsb/origin,bparees/origin,miminar/origin,openshift/origin,pmorie/origin,aveshagarwal/origin,xiuwang/origin,dobbymoodge/origin,JacobTanenbaum/origin,robertol/origin,akram/origin,jupierce/origin,rchicoli/openshift-origin,sallyom/origin,childsb/origin,simo5/origin,ramr/origin,gashcrumb/origin,dcbw/origin,rootfs/origin,tiwillia/origin,jwhonce/origin,jwhonce/origin,maleck13/origin,tdawson/origin,gashcrumb/origin,detiber/origin,tnozicka/origin,stackdocker/origin,jeffvance/origin,xiuwang/origin,elyscape/origin,pecameron/origin,rhuss/origin,gruiz17/origin,mfojtik/origin,nak3/origin,spadgett/origin,legionus/origin,mrogers950/origin,chmouel/origin,zhaosijun/origin,rrati/origin,anpingli/origin,danwinship/origin,spinolacastro/origin,inlandsee/origin,spadgett/origin,liangxia/origin,mrogers950/origin,adelton/origin,chlunde/origin,linzhaoming/origin,fabianofranz/origin,hferentschik/origin,pweil-/origin,nhr/origin,knobunc/origin,dobbymoodge/origin,jdnieto/origin,soltysh/origin,gashcrumb/origin,hferentschik/origin,sg00dwin/origin,elyscape/origin,raffaelespazzoli/origin,dinhxuanvu/origin,willmtemple/origin,jim-minter/origin,rootfs/origin,asiainfoLDP/datafactory,tdawson/origin,linearregression/origin,soltysh/origin,rchicoli/openshift-origin,markllama/origin,rajatchopra/origin,xiuwang/origin,hroyrh/origin,smarterclayton/origin,php-coder/origin,kargakis/origin,sallyom/origin,jupierce/origin,linzhaoming/origin,aveshagarwal/origin,zhaosijun/origin,imcsk8/origin,goern/origin,tracyrankin/origin,mkumatag/origin,danmcp/origin,tnozicka/origin,raffaelespazzoli/origin,wanghaoran1988/origin,tagoh/origin,goern/origin,dinhxuanvu/origin,php-coder/origin,hroyrh/origin,arilivigni/origin,stevekuznetsov/origin,tnozicka/origin,louyihua/origin,Miciah/origin,anpingli/origin,chlunde/origin,PI-Victor/origin,ironcladlou/origin,jupierce/origin,kargakis/origin,maleck13/origin,tagoh/origin,arilivigni/origin,dcbw/origin,sdminonne/origin,pravisankar/origin,fabianofranz/origin,wjiangjay/origin,childsb/origin,jprukner/origin,tiwillia/origin,legionus/origin,liangxia/origin,mrogers950/origin,rajatchopra/origin,aveshagarwal/origin,legionus/origin,liggitt/origin,sg00dwin/origin,jdnieto/origin,sspeiche/origin,spinolacastro/origin,eparis/origin,jdnieto/origin,markllama/origin,sjug/origin,jdnieto/origin,simo5/origin,detiber/origin,linearregression/origin,linzhaoming/origin,miminar/origin,jwhonce/origin,rrati/origin,nhr/origin,maxamillion/origin,jeremyeder/origin,robertol/origin,spadgett/origin,knobunc/origin,linzhaoming/origin,pravisankar/origin,sspeiche/origin,liggitt/origin,markllama/origin,spinolacastro/origin,liangxia/origin,dobbymoodge/origin,dcbw/origin,adelton/origin,abutcher/origin,marun/origin,pecameron/origin,rajatchopra/origin,smarterclayton/origin,tiwillia/origin,thrasher-redhat/origin,rootfs/origin,sgallagher/origin,juanvallejo/origin,jwforres/origin,gruiz17/origin,rhuss/origin,abutcher/origin,kargakis/origin,asiainfoLDP/datafactory,rchicoli/openshift-origin,wjiangjay/origin,juanvallejo/origin,ramr/origin,pravisankar/origin,luciddreamz/origin,maleck13/origin,danmcp/origin,jwforres/origin,sferich888/origin,luciddreamz/origin,PI-Victor/origin,stevekuznetsov/origin,spinolacastro/origin,dgoodwin/origin,tagoh/origin,smarterclayton/origin,louyihua/origin,jupierce/origin,Miciah/origin,wanghaoran1988/origin,tdawson/origin,robertol/origin,nhr/origin,pmorie/origin,eparis/origin,jwhonce/origin,sgallagher/origin,liangxia/origin,spinolacastro/origin,elyscape/origin,simo5/origin,liggitt/origin,elyscape/origin,matthyx/origin,wjiangjay/origin,jeremyeder/origin,rhcarvalho/origin,php-coder/origin,wanghaoran1988/origin,liangxia/origin,rhcarvalho/origin,csrwng/origin,simo5/origin,jsafrane/origin,maxamillion/origin,sspeiche/origin,juanvallejo/origin,smarterclayton/origin,rajatchopra/origin,soltysh/origin,luciddreamz/origin,mdshuai/origin,JacobTanenbaum/origin,gabemontero/origin,tdawson/origin,robertol/origin,gruiz17/origin,smarterclayton/origin,dinhxuanvu/origin,jsafrane/origin,wanghaoran1988/origin,eparis/origin,danwinship/origin,dmage/origin,jwforres/origin,spadgett/origin,jim-minter/origin,luciddreamz/origin,rrati/origin,jeremyeder/origin,abutcher/origin,rhuss/origin,detiber/origin,ramr/origin,sferich888/origin,jpeeler/origin,mkumatag/origin,markllama/origin,miminar/origin,thrasher-redhat/origin,goern/origin,jeffvance/origin,raffaelespazzoli/origin,adelton/origin,mrogers950/origin,jprukner/origin,imcsk8/origin,spadgett/origin,ryanj/origin,juanvallejo/origin,chmouel/origin,enj/origin,gashcrumb/origin,simo5/origin,pravisankar/origin,jeffvance/origin,ramr/origin,sjug/origin,mdshuai/origin,tracyrankin/origin,danwinship/origin,elyscape/origin,hferentschik/origin,rhuss/origin,stackdocker/origin,pmorie/origin,ryanj/origin,enj/origin,ramr/origin,asiainfoLDP/datafactory,mrogers950/origin,matthyx/origin,gruiz17/origin,ncdc/origin,nhr/origin,ingvagabund/origin,jupierce/origin,nak3/origin,deads2k/origin,csrwng/origin,rchicoli/openshift-origin,asiainfoLDP/datafactory,dinhxuanvu/origin,wjiangjay/origin,dmage/origin,jpeeler/origin,spinolacastro/origin,abutcher/origin,tiwillia/origin,imcsk8/origin,rajatchopra/origin,knobunc/origin,matthyx/origin,jprukner/origin,zhaosijun/origin,rootfs/origin,ravisantoshgudimetla/origin,sspeiche/origin