[petsc-dev] workflow diagram

[Satish Balay]

On Wed, 30 Apr 2014, Satish Balay wrote:

> On Wed, 30 Apr 2014, Jed Brown wrote:
> 
> > Satish Balay <balay at mcs.anl.gov> writes:
> > >> Hmm, feature releases are in first-parent history of both 'maint' and
> > >> 'master'.  We tag a release on 'master', then do a fast-forward merge of
> > >> the release tag into 'maint'.
> > >
> > > Ok - updated.
> > 
> > Aesthetically, I like the branches being straight lines, but I think
> > this still looks like the release tag is not in first-parent history of
> > 'maint' (like as though there is a no-ff merge).
> 
> I used vertical lines to convey that master,maint,next at that point are equivalent

Ok - I added 'action' box to indicate the ff-merge from master to next.

Satish