[SciPy-Dev] Scipy docstrings
Fri Sep 21 14:04:22 CDT 2012
On Thu, Sep 20, 2012 at 6:50 AM, Cera, Tim <firstname.lastname@example.org> wrote:
> A whole bunch of conflicts and merges showed up on the docstring editor at
> 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.
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the SciPy-Dev