[petsc-dev] did I mess up master?

[Satish Balay]

On Mon, 30 Mar 2015, Jed Brown wrote:

> Satish Balay <balay at mcs.anl.gov> writes:
> 
> > You mean 'origin/master' was ahead of 'origin' by 44 commits?
> >
> > The following looks ok to me. [presumably 9780fa96a767300e577882a0af3393de3467f0b4
> > was where 'master' was at - when you tried to push..]
> >
> > $ git log 9780fa96a767300e577882a0af3393de3467f0b4..23524bc85f88d7c2c867e276c52fc9d9816c7ba0
> > commit 23524bc85f88d7c2c867e276c52fc9d9816c7ba0
> > Merge: a45e4fd 9780fa9
> > Author: Mark Adams <mfadams at lbl.gov>
> > Date:   Sun Mar 29 07:56:12 2015 -0700
> >
> >     Merge branch 'master' of https://bitbucket.org/petsc/petsc
> 
> This is a merge from upstream.  You're supposed to pull first, then
> merge your branch.

I interpreted this merge as 'commits were made directly to master' -
not a separate feature branch.

Satish