On Fri, May 20, 2011 at 6:58 PM, Eric Firing <efir...@hawaii.edu> wrote:
>
> I have not yet tried to build from your branch, but based on
> descriptions and discussions, it should be a substantial improvement. Go
> ahead and push when you feel ready. Thank you for all the work.
>
>
I have started to try and merge my branch into the v1.0.x branch when I
discovered some interesting oddities, and I am not 100% sure how I should go
about resolving them. My very first commit in the docfix/smalltypos branch
edited the doc/users/installing.rst document. However, it appears that on
April 1, this file was removed from the repository and its information was
consolidated over to the INSTALL file. However, even though I created my
branch from the v1.0.x branch on April 30th, none of these changes are in my
branch. Therefore, given how many other changes that were made to the
documents, I wonder what other commits are missing.
Should I rebase my docfix/smalltypos branch with v1.0.x first or should I
use the conflict merge process to let the installing.rst file be removed and
make the changes I made over in INSTALL? Or maybe another idea that I
haven't thought of?
Ben Root
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
