Long story short

We use OneFlow + GitHub Forks.

This means:

• make a fork of the upstream repository
• create a feature branch in your fork (named e.g., feature/foobar)
• work on the feature in your fork
• push the “create PR” button at the upstream repo.
• Select you_fork:feature/foobar to merge into the main branch (in the “Draft” state): you_fork:feature/foobar → upstream:main
• Let CI/CD automation do its magic
• If tests are green, ask for review
• When the reviewer approves, merge.

Video explanation (14m) about how to work with GitHub forks.

🍴 Why Forks? 🍴

Short answer:

Branch list is a shared resource that gets overused quickly (think “tragedy of the commons”). Forks make that resource private instead, thus saving everyone’s nerves.

• Long answer (with all the pros and cons, and some images, too)

OneFlow model

OneFlow is a simplified version of the GitFlow/GitHubFlow branching model. Here it is: