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? Kindest regards, Tim
On Thu, Sep 20, 2012 at 6:50 AM, Cera, Tim <tim@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
Thanks. I looked at the scipy commits yesterday and came to the same conclusion. Kindest regards, Tim
On Fri, Sep 21, 2012 at 3:25 PM, Cera, Tim <tim@cerazone.net> wrote:
Thanks. I looked at the scipy commits yesterday and came to the same conclusion.
Kindest regards, Tim
I was just looking at scipy.io.netcdf's docstring on the doceditor page, and it is showing a rather large change waiting for review, essentially undoing all of the work I did back in 2010. Note that the changes have yet to be merged in, but I don't know how to flag as rejected. Ben Root
On Tue, Oct 9, 2012 at 9:09 AM, Benjamin Root <ben.root@ou.edu> wrote:
On Fri, Sep 21, 2012 at 3:25 PM, Cera, Tim <tim@cerazone.net> wrote:
Thanks. I looked at the scipy commits yesterday and came to the same conclusion.
Kindest regards, Tim
I was just looking at scipy.io.netcdf's docstring on the doceditor page, and it is showing a rather large change waiting for review, essentially undoing all of the work I did back in 2010. Note that the changes have yet to be merged in, but I don't know how to flag as rejected.
Ben Root
Actually, looking again at the docstrings, I am not at all sure if what is currently in v0.11.x is the old stuff, while what is on the doceditor is what I originally created and had merged in back in 2010. This is confusing. Ben Root
09.10.2012 16:14, Benjamin Root kirjoitti: [clip]
Actually, looking again at the docstrings, I am not at all sure if what is currently in v0.11.x is the old stuff, while what is on the doceditor is what I originally created and had merged in back in 2010. This is confusing.
What is in the doc editor is still what you originally wrote: http://docs.scipy.org/scipy/docs/scipy.io.netcdf/log/ Whether the merges suggested by it always make sense is then another question. -- Pauli Virtanen
participants (4)
-
Benjamin Root -
Cera, Tim -
Pauli Virtanen -
Ralf Gommers