In the world of modern software development, version control is essential, and Git has emerged as the... Tagged with git, github, githunt, twitter.

Mouad Dadda

Safari

Community Picks is a section on daily.dev where our community members share the most interesting and valuable content they've discovered online. From insightful articles to handy tools, every post is a gem curated by our dedicated coomunity. To contribute to Community Picks, you need to have at least 250 reputation points, ensuring that only active and trusted members can share their finds.

Community Picks

Version control is essential in modern software development, and Git is the industry standard. This guide explores popular Git branching strategies, including GitFlow, GitHub Flow, GitLab Flow, Trunk-Based Development, Feature Branching, Environment Branching, Release Branching, and Forking Workflow. It details the structure and workflow of each strategy, along with their pros and cons, helping readers choose the best strategy for their team and project requirements.

Git Branching Strategies: A Comprehensive Guide

Nice! Thank you! We use GitLab Flow in our environment. Works ok but it isn’t very suitable for larger teams (&gt;4). Since our deployment goes from dev (main branch) to preprod and after testing to prod, if one needs to deploy to production all the other features come together and thats not always desired. Maybe they were untested yet. So it’s not very continous. You also need to constantly update (merge dev to) your feature branches. Good thing is the clear separation and that all branches are synced.

This is really helpful information regarding GitHub branches.

Those diagrams were super helpful. Thanks for putting it all together.

I tend to use Environment branching with a combination of GitFlow
If there are a bug in production we branch out from production with hotfix/bug-task
And then cherry pick that into development
While staging is used to test all the features from development
and all development are branch out from development as tasks/task-number
Thanks for this, i did not have a label for it before t his

Nice article with great diagrams. We run with „feature branching“ which works best for us. Development branch is also staging branch for CI/CD and master is production