<div dir="ltr">ok.  I'll forge the push to my forked bb copy then.  </div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 30, 2014 at 10:38 AM, Matthew Turk <span dir="ltr"><<a href="mailto:matthewturk@gmail.com" target="_blank">matthewturk@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Mike,<br>
<br>
I think this might be unavoidable, once we stopped having the yt-3.0<br>
branch be the destination.  I can try taking a shot at it, but I think<br>
it's probably okay.<br>
<br>
-Matt<br>
<div><div class="h5"><br>
On Tue, Sep 30, 2014 at 9:33 AM, Michael Zingale<br>
<<a href="mailto:michael.zingale@stonybrook.edu">michael.zingale@stonybrook.edu</a>> wrote:<br>
> At the moment, in the yt repo, we have two heads on the yt-3.0 branch -- is<br>
> that what we want?  I try merging them in my local copy and it doesn't go<br>
> cleanly.<br>
><br>
> --<br>
> Michael Zingale<br>
> Associate Professor<br>
><br>
> Dept. of Physics & Astronomy • Stony Brook University • Stony Brook, NY<br>
> 11794-3800<br>
> phone:  <a href="tel:631-632-8225" value="+16316328225">631-632-8225</a><br>
> e-mail: <a href="mailto:Michael.Zingale@stonybrook.edu">Michael.Zingale@stonybrook.edu</a><br>
> web: <a href="http://www.astro.sunysb.edu/mzingale" target="_blank">http://www.astro.sunysb.edu/mzingale</a><br>
><br>
</div></div>> _______________________________________________<br>
> yt-dev mailing list<br>
> <a href="mailto:yt-dev@lists.spacepope.org">yt-dev@lists.spacepope.org</a><br>
> <a href="http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org" target="_blank">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org</a><br>
><br>
_______________________________________________<br>
yt-dev mailing list<br>
<a href="mailto:yt-dev@lists.spacepope.org">yt-dev@lists.spacepope.org</a><br>
<a href="http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org" target="_blank">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Michael Zingale</div><div>Associate Professor</div><div><br></div><div>Dept. of Physics & Astronomy • Stony Brook University • Stony Brook, NY 11794-3800</div><div><i>phone</i>:  631-632-8225</div><div><i>e-mail</i>: <a href="mailto:Michael.Zingale@stonybrook.edu" target="_blank">Michael.Zingale@stonybrook.edu</a></div><div><i>web</i>: <a href="http://www.astro.sunysb.edu/mzingale" target="_blank">http://www.astro.sunysb.edu/mzingale</a></div>
</div>