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

[Tobin Isaac]

On Tue, Sep 02, 2014 at 07:57:29AM -0600, Jed Brown wrote:
> Tobin Isaac <tisaac at ices.utexas.edu> writes:
> >> Matt and Toby: 'tisaac/thplex' needs to be rebased onto 'master' before
> >> we can accept it.  Matt, please remember to look at what you are
> >> merging.  When the commit message says you are merging hundreds of
> >> commits, but you didn't review hundreds of commits, it should be a sign
> >> that something is amiss.
> >
> > Matt, do you want me to handle this?
> 
> I'm perusing history with
> 
>   gitk master..tisaac/thplex     # includes recent merge of 'tisaac/dm-dim-embed-auto' with recent stuff from 'next'
>   gitk master..tisaac/thplex^^   # much cleaner, but still based on 'next'
> 
> I would probably fix by creating a new branch and cherry-picking the
> ranges of clean commits starting from the oldest commits in your branch.

Aleady have gitk open and tisaac/thplex-on-master created.  I have to
be little careful about GetDimension() being moved from DMPlex to DM,
but I think I've got it.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140902/915cc8a5/attachment.sig>