[petsc-dev] 'master' RESET after bad merge! - 'tisaac/thplex' was based on 'next'

[Jed Brown]

Matthew Knepley <knepley at gmail.com> writes:
>> Obviously everyone wants (1) and (3) to be automated - but we
>> currently don't have that..
>
>
> I, of course, disagree. (1) is now automated in that you get a warning
> if you try to merge next. That will help me. Please avert your eyes.

We have way bigger problems if people are skipping (1).  Branches need
to be reviewed before merging.  Always.  Why is this even being
discussed?

Having a warning to remind contributors sounds useful to me, but
integrators should never be merging without reviewing.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140904/fa6b375c/attachment.sig>