Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Continuous documentation #181

Merged
merged 12 commits into from
Mar 23, 2021
Merged

Continuous documentation #181

merged 12 commits into from
Mar 23, 2021

Conversation

formatc1702
Copy link
Collaborator

The aim of this branch is to advance in parallel to the dev branch as PRs are merged and features added.

This can include expanding the syntax description (syntax.md), the changelog (CHANGELOG.md), the general readme (README.md) or others.

Before a release, this branch can be then squashed and rebased onto dev to reflect all the updates included in that release.

The idea is to prevent cluttering the commit history with individual commits from each PR documenting itself (Add #xxx to changelog, Expand syntax description to reflect new feature from #yyy). It remains to be seen whether this is a good idea, and I am open to feedback on this topic.

@formatc1702 formatc1702 added this to the v0.3 milestone Oct 17, 2020
@kvid
Copy link
Collaborator

kvid commented Feb 20, 2021

Please consider including what @JelmerT suggests in #213 (comment).

@formatc1702
Copy link
Collaborator Author

formatc1702 commented Mar 20, 2021

Looking to merge #214 and #219, I'm wondering whether it makes sense to

or whether to

  • revert back to having the documentation for a new feature updated as part of the PR that implements the feature itself.

I'm starting to lean towards the latter, since this way, the documentation in the dev branch will always be up to date, and it reduces the number of PRs in case the PR author writes the documentation themselves (since I cannot put as much work into the project as I want right now, this will be the case more often than not).
If there are no objections, I would squash-merge this branch into dev and proceed to request updated documentation as part of relevant PRs.

@kvid
Copy link
Collaborator

kvid commented Mar 21, 2021

Looking to merge #214 and #219,

Why not consider #197 before these?

I'm wondering whether it makes sense to

or whether to

  • revert back to having the documentation for a new feature updated as part of the PR that implements the feature itself.

I'm starting to lean towards the latter, since this way, the documentation in the dev branch will always be up to date, and it reduces the number of PRs in case the PR author writes the documentation themselves (since I cannot put as much work into the project as I want right now, this will be the case more often than not).
If there are no objections, I would squash-merge this branch into dev and proceed to request updated documentation as part of relevant PRs.

Making a choice that can reduce your amount of work seems like a good idea.

Whatever you choose, I suggest updating CONTRIBUTING.md with a description of if/how the contributors are expected to update the CHANGELOG.md and other documentation affected by the PR.

@formatc1702
Copy link
Collaborator Author

Why not consider #197 before these?

I did not mention it here since it is does not affect the documentation (as far as I understand).

Making a choice that can reduce your amount of work seems like a good idea.

Whatever you choose, I suggest updating CONTRIBUTING.md with a description of if/how the contributors are expected to update the CHANGELOG.md and other documentation affected by the PR.

A good compromise would be to ask contributors to update any syntax documentation themselves if necessary, but to keep CHANGELOG.md updated by whoever actually merges a PR into dev.

@formatc1702 formatc1702 mentioned this pull request Mar 21, 2021
@kvid
Copy link
Collaborator

kvid commented Mar 21, 2021

Why not consider #197 before these?

I did not mention it here since it is does not affect the documentation (as far as I understand).

You are right.

Making a choice that can reduce your amount of work seems like a good idea.
Whatever you choose, I suggest updating CONTRIBUTING.md with a description of if/how the contributors are expected to update the CHANGELOG.md and other documentation affected by the PR.

A good compromise would be to ask contributors to update any syntax documentation themselves if necessary, but to keep CHANGELOG.md updated by whoever actually merges a PR into dev.

In that case, I guess you still want a continous PR for the change log similar to this PR?

@formatc1702 formatc1702 marked this pull request as ready for review March 23, 2021 10:51
@formatc1702 formatc1702 merged commit cbc30b7 into dev Mar 23, 2021
@formatc1702 formatc1702 deleted the feature/documentation branch March 23, 2021 10:53
@formatc1702 formatc1702 mentioned this pull request Mar 23, 2021
@formatc1702
Copy link
Collaborator Author

In that case, I guess you still want a continous PR for the change log similar to this PR?

Yes, see #228.

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

Successfully merging this pull request may close these issues.

None yet

2 participants