[Numpy-discussion] azip

Pauli Virtanen pav at iki.fi
Thu Jul 18 14:21:19 EDT 2013

18.07.2013 21:11, Benjamin Root kirjoitti:
> Well, that's nice to know now. However, I distinctly remember being told
> that any changes made to the docstrings directly in the source would end
> up getting replaced by whatever was in the doc edit system whenever a
> merge from it happens. Therefore, if one wanted their edits to be
> persistent, they had to submit it through the doc edit system.

I think there must have been some misunderstanding here: the doc editor 
works similarly to VCS, in that it will detect merge conflicts and 
require someone to manually resolve conflicts if the docstring in the 
source code has been changed.

Pauli Virtanen

More information about the NumPy-Discussion mailing list