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

[Matthew Knepley]

On Tue, Sep 2, 2014 at 9:02 AM, Tobin Isaac <tisaac at ices.utexas.edu> wrote:

> 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.
>

Okay, cool. I will let you do the merge. Let me know and I will test stuff
after its done.

  Thanks,

     Matt

-- 
What most experimenters take for granted before they begin their
experiments is infinitely more interesting than any results to which their
experiments lead.
-- Norbert Wiener
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140902/50c987d0/attachment.html>