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

Development Documentation on Git/GitHub #370

Open
wants to merge 7 commits into
base: dev
Choose a base branch
from
Open

Conversation

TimothyWillard
Copy link
Contributor

@TimothyWillard TimothyWillard commented Oct 29, 2024

Describe your changes.

This pull request adds documentation on development, in particular on git/GitHub usage. It doesn't include a visual yet (although I think that would be super helpful), because this great visual created by @pearsonca doesn't contain hot fixes yet and also have to figure out the best way to include this image. I believe the documentation accurately reflects where we have landed but if there are issues please let me know.

What does your pull request address? Tag relevant issues.

This pull request addresses the documentation portion of GH-369.

Tag relevant team members.

@alsnhll @emprzy @fang19911030 @jcblemai @MacdonaldJoshuaCaleb @pearsonca @saraloo @shauntruelove @twallema

@TimothyWillard TimothyWillard added documentation Relating to ReadMEs / gitbook / vignettes / etc. medium priority Medium priority. meta/workflow Relating to CI / issue templates / testing frameworks / etc. labels Oct 29, 2024
Copy link
Contributor

@pearsonca pearsonca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything that's addressed here works for me.

However, we also need to address how gitbook integrates with this.

I recommend:

  • we designate gitbook maintainer team
  • dev changes should also have whatever documentation/... changes corresponding to feature changes; these do not propagate to gitbook until release stage (see below), but should try to get gitbook team comments when merging features
  • bugfixes to main that also entail documentation/... changes should PR to gitbook; gitbook team has responsibility to deal with any merge issues (n.b. bugfixes always push to dev irrespective of gitbook changes, for which dev folks are responsible for rebase/merge issues)
  • changes via gitbook api / or directly to gitbook branch would be merged to main during the release stage
  • during release: should be able to apply dev directly to main (dev folks have responsibility for merge issues). then apply gitbook revs (gitbook maintainers responsible for merge issues, ideally this should be a straightforward rebase).
  • once release is resolved, both dev and gitbook should point to new main release commit

@saraloo
Copy link
Contributor

saraloo commented Nov 6, 2024

Thanks, the documentation is super clear and helpful instructions from an ops perspective. 👍

@TimothyWillard
Copy link
Contributor Author

I made some minor edits to clarify how documentation works. However, I did not make mention of a "GitBook maintainer team". I think that would require some discussion outside of this PR to come to a consensus.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Relating to ReadMEs / gitbook / vignettes / etc. medium priority Medium priority. meta/workflow Relating to CI / issue templates / testing frameworks / etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants