[petsc-dev] git workflow question

[Matthew Knepley]

On Fri, Jul 18, 2014 at 11:10 AM, Dominic Meiser <dmeiser at txcorp.com> 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>
> 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.
>

As long as fix-cusp-bjacobi graduates before the new fix, its fine to just
merge it in

   Matt


> Cheers,
> Dominic
>
>
>     Matt
>
>
>> Thanks.
>> Dominic
>>
>> --
>> Dominic Meiser
>> Tech-X Corporation
>> 5621 Arapahoe Avenue
>> Boulder, CO 80303
>> USA
>> Telephone: 303-996-2036
>> Fax: 303-448-7756
>> www.txcorp.com
>>
>>
>
>
>  --
> What most experimenters take for granted before they begin their
> experiments is infinitely more interesting than any results to which their
> experiments lead.
> -- Norbert Wiener
>
>
>
> --
> Dominic Meiser
> Tech-X Corporation
> 5621 Arapahoe Avenue
> Boulder, CO 80303
> USA
> Telephone: 303-996-2036
> Fax: 303-448-7756www.txcorp.com
>
>


-- 
What most experimenters take for granted before they begin their
experiments is infinitely more interesting than any results to which their
experiments lead.
-- Norbert Wiener
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140718/7985d669/attachment.html>