<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 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><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 href="tel:303-996-2036" value="+13039962036" target="_blank">303-996-2036</a><br>
Fax: <a href="tel:303-448-7756" value="+13034487756" target="_blank">303-448-7756</a><br>
<a 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>