[petsc-dev] PTScotch 6

[Jed Brown]

On Tue, Mar 19, 2013 at 12:43 PM, Satish Balay <balay at mcs.anl.gov> wrote:

> On Tue, 19 Mar 2013, Satish Balay wrote:
>
> > If so - how will the patch get into master? Previously all 33 stuf
> > landed in dev with direct pull.  Same workflow or different here?
> >
> > with new workflow all 'master' gets merged periodically to 'next' - so
> > same periodic merge from 'maint' to 'master'?
>
> This part is unanswerd.


Yes, we periodically merge from 'maint' to 'master'.

One reason, besides testing, to put patches in topic branches is that they
can be individually merged to 'master' instead of possibly building up
several of them in 'maint'.

This makes the merges of 'maint' into 'master' always trivial, rather than
an opportunity for merge conflicts.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20130319/f6f2b241/attachment.html>