The source of everything, the choice of code branching strategy

I remember about a year ago , When I chat with my friend Lao Wu over tea , It was discussed that : Efficient continuous delivery system , A suitable code branching strategy must be needed .

I told Lao Wu :“ Adopt different code branching strategies , It means implementing different code integration and online processes , This will affect the way the entire R & D team cooperates on a daily basis , Therefore, R & D teams usually choose their own strategies very carefully ."

Lao Wu is a senior architect with many years of development experience , At that time, I was about to take over a framework team , Transform from individual contributor to team manager . He is personally familiar with code management tools , Even “ Antique ” Of CVS Can chat with you for a long time . But when he formulated the code branch management strategy for the team , Or be cautious , This shows its importance .

In the end, we found out , Decide which code branch management strategy to choose , Several questions need to be assumed first , There are answers to these questions , It means that you have found the right direction . A few questions you need to think about are as follows :

1.Google and Facebook These two Internet giants are developing with trunk (Trunk Based Development abbreviation TBD), Are we also referring to them , Adopt the trunk development branch strategy ?

2. use Google Search for , You will find a high ranking branching strategy , It's called “Asuccessful Git branching model”( abbreviation GitFlow), Is it really easy to use ? Can the team apply it directly ?

3.GitHub and GitLab These two most popular code management platforms , Each launched GitHubFlow and GitLabFlow, What's the difference ? Is it suitable for me ?

4. Like Ali 、 Ctrip and meituan comment on such well-known domestic Internet companies , What branching strategies are being used ?

today , I want to follow the thinking path at that time , Review and summarize with you , I hope I can give you a comprehensive understanding of code branching strategy , Help you make the right choice .

Talk about trunk development (TBD)

Trunk development is a