[Pulp-dev] PUP-3: Proposal to change our git workflow
mhrivnak at redhat.com
Tue Jun 6 19:48:30 UTC 2017
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.
Principal Software Engineer, RHCE
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Pulp-dev