Skip to content
This repository has been archived by the owner on Jun 22, 2022. It is now read-only.

Docs3 #105

Closed
wants to merge 3 commits into from
Closed

Docs3 #105

wants to merge 3 commits into from

Conversation

bcottman
Copy link

Pull Request template

Doc contributions

Contributing.html
FAQ.html
intro.html
testdoc.html

tested by running in docs/

>>> (Steppy) sphinx-apidoc -o generated/ -d 4 -fMa ../steppy
 >>> (Steppy) clear;make clean;make html

Regards Bruce

core contributors to the minerva.ml

@kamil-kaczmarek
Copy link
Member

Hi @bcottman,

Regarding Pull Requests with documentation. At this point we have three PRs with documentation, that is #95 #102 and #105 (this one).

Should I merge them in sequence: 95->102->105, or just take the latest one and resolve conflicts in favor of the latest PR?

Thanks for your reply,

Best,
Kamil Kaczmarek

@bcottman
Copy link
Author

bcottman commented Oct 4, 2018 via email

@bcottman
Copy link
Author

bcottman commented Oct 4, 2018 via email

@bcottman
Copy link
Author

bcottman commented Oct 5, 2018

use pull doc.test.3 for steppy-tool-kit.

@bcottman
Copy link
Author

just seeing conflicts now. will resolve

@bcottman
Copy link
Author

#97, #102 #105 can be done in order
conflicts in steppy/utils.py are due to adding extra blank line tp remove sphinx warnings.
use steppy/utils.py in pull requests
conflicts in steppy/utils.py due to adding more directives
use steppy/utils.py in pull requests

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants