tulsawebdevs / website

The Tulsa Web Devs User Group Site
GNU General Public License v3.0
1 stars 13 forks source link

chore: prepare the repo for trunk-based development #227

Closed helmturner closed 6 months ago

helmturner commented 6 months ago

I've been thinking about ways to make the contributor experience more efficient and enjoyable, and I think branch-based development would be go a long way toward that goal.

We already throw out many of our own branching conventions to facilitate a better pace during Hack Nights, so @zenlex and I came to the conclusion that it doesn't really make sense to heighten those requirements for async work. Given that contributors already have to fork the repo, and deployment isn't necessarily tied to branching, it makes sense to just stop using branches as a form of GH repo management. The goal, then, is to have just 1 branch: main. Everyone forks, and PRs, to main.

This will require some changes in the contributor flow to work, though. The new guidance will be based around these principles:

Steps to implement:

@CKCarr @deino475 This change is sure to have a big impact not only on contributors, but on current and future maintainers. Any thoughts on all this?

zenlex commented 6 months ago

@helmturner FYI I renamed prod to main to get away from associating the branch with a deployment and to follow your description above. Otherwise I think this is good!

zenlex commented 6 months ago

@CKCarr @deino475 I'm going to close this as done for now but feel free to reopen it with any commentary / questions / concerns you may have on this topic!