[petsc-dev] did I mess up master?

[Mark Adams]

I see, I forgot to pull.

These were trivial changes:  changed a variable name (that is a key word)
and fixed a test that did not compile anymore so I did it directly on
master.

Mark

On Mon, Mar 30, 2015 at 12:02 PM, Jed Brown <jed at jedbrown.org> wrote:

> Satish Balay <balay at mcs.anl.gov> writes:
> > I interpreted this merge as 'commits were made directly to master' -
> > not a separate feature branch.
>
> It either means developing on 'master' (which has always been
> discouraged) or doing a fast-forward merge of a topic branch (also
> discouraged, but easier to do accidentally).
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20150331/70b04351/attachment.html>