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

Jed Brown jed at jedbrown.org
Wed Sep 3 14:16:50 CDT 2014

Matthew Knepley <knepley at gmail.com> writes:
> This is truly a low point for your argument. You are not arguing against the
> usefulness, nor that automation is better than doing it by hand, but that it
> did not happen for a while and moral use of VC dictates that you do it
> manually?
> That is crazy.

A human has to review branches before merging.  Full stop.  There is no
other option until computers become so advanced that they put
programmers out of business.

When you review a branch, you see what commits are coming in.  If you
don't review the branch, there are countless ways to merge things that
you don't want.  The specific accident of merging 'next' into 'master'
or 'maint' is not the worst and actually fairly easy to notice.

And now we're back to my request: if you want the system to enforce
policy, make a concrete proposal for the precise semantics.  Otherwise
take heart that the mistake we're babbling on about cannot occur if we
do our jobs of reviewing branches before merging them.
-------------- 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/20140903/50ada71c/attachment.sig>

More information about the petsc-dev mailing list