[SciPy-Dev] Scipy docstrings

[Ralf Gommers]

On Thu, Sep 20, 2012 at 6:50 AM, Cera, Tim <tim at cerazone.net> wrote:

> A whole bunch of conflicts and merges showed up on the docstring editor at
> http://docs.scipy.org/scipy/merge/
>
> Can't 'Accept Merges' because all of the merges that I looked at did not
> follow the docstring standard.  There isn't a way to 'Reject Merges', so
> what I have done in the past is accept, then revert.  Could this be handled
> in some other way?
>

The question is where they come from. Certainly not from git master. Looks
like a doc wiki bug. I wouldn't recommend spending effort merging and
reverting before that's understood, otherwise it could easily happen again.

Ralf
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/scipy-dev/attachments/20120921/dda8fb58/attachment.html>