Branching Workflows
Two devs merged to main within minutes of each other on a Friday. The second one introduced a conflict nobody caught until a broken build hit production. Then a billing bug surfaced. The hotfix couldn't go out cleanly because the broken code was already tangled in. A 1-minute rollback turned into a two-hour fire drill. They didn't have a branching workflow.
In this video, I walk through Git Flow, GitHub Flow, and Trunk-Based Development, what each looks like in a PHP codebase, and which one fits your team's situation.
Timestamps:
0:00 Intro + the production incident
1:16 Git Flow
3:04 GitHub Flow
4:13 Trunk-Based Development
5:17 Choosing the right workflow
6:29 Gotchas
7:27 Outro
If your team doesn't have a defined workflow, stick around for the recommendation at the end.
What branching workflow does your team use? Still dealing with merge chaos? Let me know in the comments.
#PHP #Git #GitFlow #SoftwareDevelopment #PHPArchitect
Links:
Our Discord - / discord
Buy our shirts - https://store.phparch.com/products/co...
Scott's Social Media:
Website - https://scott.keck-warren.com/
Bluesky - https://bsky.app/profile/scottkeckwar...
LinkedIn - / scott-keck-warren-91689810
Mastodon - https://phpc.social/@scottkeckwarren
PHP Architect Social Media:
X: https://x.com/phparch
Mastodon: https://phparch.social/@phparch
Bluesky: https://bsky.app/profile/phparch.com
Discord: https://discord.phparch.com
Subscribe to our magazine: https://www.phparch.com/subscribe/
Thanks to our Partners:
Displace - Infrastructure Management, Simplified
https://displace.tech/
PHPScore - Put Your Technical Debt on Autopay
https://phpscore.com/
CodeRabbit - Cut code review time & bugs in half instantly with CodeRabbit.
https://www.coderabbit.ai/
Epidemic Sound
https://www.epidemicsound.com/
Get PHP Architect Merch at our Store https://store.phparch.com/
---