[Pulp-dev] PUP-3: Proposal to change our git workflow

[Brian Bouterse]

I want to make a case to adopt the PUP as its written. I think we need to
redo the git workflow because we can't continue to resolve conflicts during
merge forward as we did before. I see that as the central issue the PUP is
resolving.

On Tue, Jun 6, 2017 at 9:04 AM, David Davis <daviddavis at redhat.com> wrote:

> It seems like there are two sides thus far about how to proceed: one being
> that we should accept and implement PUP-3, and the other being that we
> should tweak our current process. I’d like to propose the following
> solution.
>
> For the 2.14 release, we try out one of the tweaks to our current git
> workflow. Namely, we turn on branch protection on Github and turn off
> pushing to branches for all branches except master. I think this is the
> simplest and most effective alternative proposed.
>
> Then when 2.14 is released, we evaluate whether this tweak has solved our
> problem or not. If it has not, we again consider moving to the workflow
> outlined in PUP-3.
>
> I think this is the best approach as it would allow us to try out tweaking
> current workflow first before redoing our entire git workflow. Thoughts?
>
>
> David
>
> On Fri, Jun 2, 2017 at 4:05 PM, Michael Hrivnak <mhrivnak at redhat.com>
> wrote:
>
>>
>> On Fri, Jun 2, 2017 at 12:01 PM, Brian Bouterse <bbouters at redhat.com>
>> wrote:
>>
>>> Yes we should enable branch protection to prevent all pushes using that
>>> script. That is one of the main benefits that accepting this pup would
>>> allow (I think).
>>
>>
>> I think doing this would be at least as beneficial in a merge-forward
>> model as a cherry-pick model. We could enable it immediately and take full
>> advantage of the added protection.
>>
>> My only question would be about the build process, and whether it
>> includes any branch pushes that we'd need to facilitate. Obviously that's
>> doable; it's just a detail to think through.
>>
>>
>> --
>>
>> Michael Hrivnak
>>
>> Principal Software Engineer, RHCE
>>
>> Red Hat
>>
>> _______________________________________________
>> Pulp-dev mailing list
>> Pulp-dev at redhat.com
>> https://www.redhat.com/mailman/listinfo/pulp-dev
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/pulp-dev/attachments/20170606/80fa832d/attachment.htm>