On Tue, Jun 6, 2017 at 9:58 AM, Brian Bouterse <[email protected]> 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
_______________________________________________
Pulp-dev mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/pulp-dev

Reply via email to