<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">On 07/18/2014 09:51 AM, Matthew Knepley
wrote:<br>
</div>
<blockquote
cite="mid:CAMYG4GnNx1OCo+E7YK-fTkNz0jNy7Rdv92yqvFTUqRf9nP+j2w@mail.gmail.com"
type="cite">
<div dir="ltr">
<div class="gmail_extra">
<div class="gmail_quote">On Fri, Jul 18, 2014 at 10:58 AM,
Dominic Meiser <span dir="ltr"><<a
moz-do-not-send="true" href="mailto:dmeiser@txcorp.com"
target="_blank">dmeiser@txcorp.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">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:<br>
<br>
1) Branch off of master and merge the other feature branch
I need into the newly create branch.<br>
2) Branch off of the other feature branch.<br>
3) Something else I'm not thinking of.<br>
</blockquote>
<div><br>
</div>
<div>I do not really understand why you just do not make the
fix in the feature branch?</div>
</div>
</div>
</div>
</blockquote>
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.<br>
<br>
Cheers,<br>
Dominic<br>
<br>
<blockquote
cite="mid:CAMYG4GnNx1OCo+E7YK-fTkNz0jNy7Rdv92yqvFTUqRf9nP+j2w@mail.gmail.com"
type="cite">
<div dir="ltr">
<div class="gmail_extra">
<div class="gmail_quote">
<div><br>
</div>
<div> Matt</div>
<div> </div>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">
Thanks.<span class="HOEnZb"><font color="#888888"><br>
Dominic<br>
<br>
-- <br>
Dominic Meiser<br>
Tech-X Corporation<br>
5621 Arapahoe Avenue<br>
Boulder, CO 80303<br>
USA<br>
Telephone: <a moz-do-not-send="true"
href="tel:303-996-2036" value="+13039962036"
target="_blank">303-996-2036</a><br>
Fax: <a moz-do-not-send="true"
href="tel:303-448-7756" value="+13034487756"
target="_blank">303-448-7756</a><br>
<a moz-do-not-send="true" href="http://www.txcorp.com"
target="_blank">www.txcorp.com</a><br>
<br>
</font></span></blockquote>
</div>
<br>
<br clear="all">
<div><br>
</div>
-- <br>
What most experimenters take for granted before they begin
their experiments is infinitely more interesting than any
results to which their experiments lead.<br>
-- Norbert Wiener
</div>
</div>
</blockquote>
<br>
<br>
<pre class="moz-signature" cols="72">--
Dominic Meiser
Tech-X Corporation
5621 Arapahoe Avenue
Boulder, CO 80303
USA
Telephone: 303-996-2036
Fax: 303-448-7756
<a class="moz-txt-link-abbreviated" href="http://www.txcorp.com">www.txcorp.com</a></pre>
</body>
</html>