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

[Michael Hrivnak]

On Tue, Jun 6, 2017 at 9:58 AM, Brian Bouterse <bbouters at redhat.com> wrote:

> 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.


The PUP likely needs additional revision in that case; it does not mention
conflict resolution at all as a motivation. It would be valuable to spell
that out and discuss it.


-- 

Michael Hrivnak

Principal Software Engineer, RHCE

Red Hat
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/pulp-dev/attachments/20170606/447b034f/attachment.htm>