Re: Allow merge commints on ovirt-node repo

Am Montag, den 27.01.2014, 09:51 +0200 schrieb Itamar Heim: > On 01/27/2014 09:45 AM, Fabian Deutsch wrote: >> Am Sonntag, den 26.01.2014, 11:54 +0200 schrieb Itamar Heim: >>> On 01/24/2014 02:46 PM, Fabian Deutsch wrote: >>>> Hey, >>>> >>>> could you please grant me the permissions to do merge commits on the >>>> ovirt-node project. >>> >>> fabian - are you talking about 'push merge commit' right? >>> project is still fast forward? >> >> Hey, >> >> yes - I'm requesting push merge commits and allowing "merges if necessary" (in the project options). >> >> - fabian >> > > are you sure you want merge-if-necessary? > engine uses rebase if necessary. vdsm uses cherry-pick. > merge seems a bit risky? He,y thanks for checking. You are right, that setting doesn't need to be changed, please keep "fast forward only" but please allow "push merge commit". Thanks fabian