[petsc-dev] git workflow question

Satish Balay balay at mcs.anl.gov
Fri Jul 18 11:07:44 CDT 2014

On Fri, 18 Jul 2014, Dominic Meiser wrote:

> On 07/18/2014 09:51 AM, Matthew Knepley wrote:
> > On Fri, Jul 18, 2014 at 10:58 AM, Dominic Meiser <dmeiser at txcorp.com
> > <mailto:dmeiser at txcorp.com>> wrote:
> >
> >     I'm starting development of a bug fix in a new feature branch. The
> >     bug fix heavily relies on work in a different feature branch which
> >     is still a long ways away from getting merged into next or master.
> >     Which of the following approaches is the recommended practice:
> >
> >     1) Branch off of master and merge the other feature branch I need
> >     into the newly create branch.
> >     2) Branch off of the other feature branch.
> >     3) Something else I'm not thinking of.
> >
> >
> > I do not really understand why you just do not make the fix in the feature
> > branch?
> To make things more specific, the bug fix is for DMDA's with cusp vectors. I
> think this will be a fair amount of work and it may take a while to complete.
> It needs work I've done in the dmeiser/fix-cusp-bjacobi branch but is
> otherwise unrelated. I thought it might be good to do it in a separate branch
> because of that. I wouldn't want work on this bug fix to hold up things with
> fix-cusp-bjacobi or to make that branch more difficult to review.

I would create a new branch off 'dmeiser/fix-cusp-bjacobi' for this
work. [assuming this new branch would be merged in next/master after
dmeiser/fix-cusp-bjacobi is merged in]


More information about the petsc-dev mailing list