ok. I'll forge the push to my forked bb copy then. On Tue, Sep 30, 2014 at 10:38 AM, Matthew Turk <matthewturk@gmail.com> wrote:

Hi Mike,

I think this might be unavoidable, once we stopped having the yt-3.0 branch be the destination. I can try taking a shot at it, but I think it's probably okay.

-Matt

On Tue, Sep 30, 2014 at 9:33 AM, Michael Zingale <michael.zingale@stonybrook.edu> wrote:

...

At the moment, in the yt repo, we have two heads on the yt-3.0 branch -- is that what we want? I try merging them in my local copy and it doesn't go cleanly.

-- Michael Zingale Associate Professor

Dept. of Physics & Astronomy • Stony Brook University • Stony Brook, NY 11794-3800 phone: 631-632-8225 e-mail: Michael.Zingale@stonybrook.edu web: http://www.astro.sunysb.edu/mzingale

_______________________________________________ yt-dev mailing list yt-dev@lists.spacepope.org http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org

_______________________________________________ yt-dev mailing list yt-dev@lists.spacepope.org http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org

-- Michael Zingale Associate Professor Dept. of Physics & Astronomy • Stony Brook University • Stony Brook, NY 11794-3800 *phone*: 631-632-8225 *e-mail*: Michael.Zingale@stonybrook.edu *web*: http://www.astro.sunysb.edu/mzingale