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

[Jed Brown]

Matthew Knepley <knepley at gmail.com> writes:
> The concrete proposal has been made many times. Here it is again: Do not
> let anyone merge next into master. 

Which 'next'?  What about parents of 'next' or abandoned branches?  Do
we care about the local 'next' or the 'next' associated with a remote?
Which remote?  Recall that in this case, it wasn't "git merge next", but
someone starting a branch in a different repository that contains
commits not present in 'master'.  Define what you mean there.  What if
someone starts that branch and rebases onto 'master' (rewriting commits
From 'next' so that they are not longer in the history of 'next')?

But "don't merge 'next' into 'master'" is laughably short of the scope
of what you are really asking for.  If you want to make a serious
proposal, do that.

> Babbling about how easy errors are to avoid is senseless, and
> completely blind to all the neurological research.  People make simple
> mistakes all the time in every endeavor.

Add "review the commits in branch" to your merge checklist.
-------------- 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/28f28294/attachment.sig>