[IPython-dev] Merging nbconvert **now**
Sun Jun 30 20:27:27 CDT 2013
for reference, the correct PR that preserves history is here:
We'd always said we'd fully preserve the history of the nbconvert
effort to properly credit all its authors.
I don't know if Min ended up using the git subtree merging approach
(http://git-scm.com/book/ch6-7.html), but it seems that #3500 has all
the proper history.
We can continue the discussion there...
On Sun, Jun 30, 2013 at 3:46 PM, Brian Granger <email@example.com> wrote:
> Here is the PR:
> On Sun, Jun 30, 2013 at 2:27 PM, Jonathan Frederic <firstname.lastname@example.org> wrote:
>> Sounds good to me.
>> On 6/30/2013 1:34 PM, Brian Granger wrote:
>>> The merge would be by hand and only include the nbconvert package and
>>> top level script. nbconvert1 is not coming along...
>>> On Sun, Jun 30, 2013 at 1:23 PM, Matthias BUSSONNIER
>>> <email@example.com> wrote:
>>>> Le 30 juin 2013 à 21:28, Brian Granger a écrit :
>>>>> What do others think?
>>>> I think that would be great to merge, at least the module, if not the entry point yet.
>>>> I'm really over-booked theses day, I'll do my best to review, but it will be really hard.
>>>> Don't know how you intend to make the merge, but dropping nbconvert1(and other
>>>> useless stuff like python-armor that was an example) might be great to do before merging.
>>>> IPython-dev mailing list
>> IPython-dev mailing list
> Brian E. Granger
> Cal Poly State University, San Luis Obispo
> firstname.lastname@example.org and email@example.com
> IPython-dev mailing list
Fernando Perez (@fperez_org; http://fperez.org)
fperez.net-at-gmail: mailing lists only (I ignore this when swamped!)
fernando.perez-at-berkeley: contact me here for any direct mail
More information about the IPython-dev