Vote on branching strategy, naming conventions

[genedan]

Three items:

1. Branching Strategy

This came to mind when I saw #1125, a similar subject but not quite the direct answer to it. I think our current strategy naturally arose from our own problem-solving, which has gotten us far, but I think we should pick a named industry convention. There are several options:

• GitFlow
• GitHub Flow
• GitLab Flow
• Trunk-Based Development
• Feature Branching
• Environment Branching
• Release Branching
• Forking Workflow

Here's a quick reference:

https://dev.to/karmpatel/git-branching-strategies-a-comprehensive-guide-24kh#github-flow

I propose a ranked-choice vote (mandatory for codeowners), and then we'll also tally any votes submitted by anyone before the last codeowner votes. What you do is you just rank your choices from best to worst and then we'll tally up the points at the end.

2. Diagram example

After the vote, put a little flow diagram of the winner in the Google doc, could just be a copy-paste job from the blog post, it's not official, just a reminder to make a real diagram when we're ready to upload to the official docs.

3. Naming convention

Found this through a Google search:

https://conventionalbranch.org/

[kennethshsu]

Thanks so much for sharing these here. I don't think this is currently a pain point though, even though the code owners are creating branches on the repo, I don't find that it's too cluttered yet. I also don't have enough experience to say which one I like more...