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

add gitflow chapter #42

Merged
merged 4 commits into from
Dec 5, 2024
Merged

add gitflow chapter #42

merged 4 commits into from
Dec 5, 2024

Conversation

sckott
Copy link
Member

@sckott sckott commented Oct 21, 2024

fixes #33

Please take a look. Seem good as a separate chapter, or should it live somewhere else? Look at in light and dark mode to make sure the diagram looks ok. Let me know if the diagram could be any better

@sckott sckott requested review from tefirman and seankross October 21, 2024 18:12
sckott added a commit to getwilds/.github that referenced this pull request Dec 2, 2024
@sckott
Copy link
Member Author

sckott commented Dec 2, 2024

@seankross @tefirman Do we want to make gitflow something we use across all WILDS repos or only use for certain projects? AFAICT we hadn't said we wanted to have a "rule" about this in our set of rules. This decision has a big impact on the wording in this chapter. Based on our past conversations, it seems like we want to have gitflow be optional such that each repo would need to indicate that they are using a gitflow/dev branch model (or let a contributor know if they accidentally submit a PR against main

@seankross
Copy link

My feeling is that if a repo has a Stable badge, it has to use gitflow, otherwise it doesn't have to.

@sckott
Copy link
Member Author

sckott commented Dec 3, 2024

Sounds good to have gitflow be a rule for stable

Copy link

github-actions bot commented Dec 4, 2024

@getwilds getwilds deleted a comment from github-actions bot Dec 5, 2024
@getwilds getwilds deleted a comment from github-actions bot Dec 5, 2024
@getwilds getwilds deleted a comment from github-actions bot Dec 5, 2024
@sckott
Copy link
Member Author

sckott commented Dec 5, 2024

So actually I don't think we need any further changes. we already have rules for this see https://deploy-preview-42--monumental-cassata-2f9bb7.netlify.app/maintenance

Instead of just Stable we already said we want Prototype and Stable to have git flow essentially (main branch protection, only update main via PR from dev, hotfix branches)

@sckott
Copy link
Member Author

sckott commented Dec 5, 2024

Merging now

@sckott sckott merged commit 158005e into main Dec 5, 2024
2 checks passed
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.

Precipitate gitflow into the guide
2 participants