Git Branching Strategies

Git Branching Strategies | Wahl Network

As more of your infrastructure is defined using code stored in source control, a new challenge emerges - having a solid branching strategy. After all, the code will require patches, hotfixes, updates, new resources - there's a lot going on for your and your team to tackle. This video dives into branching strategies for Terraform code stored and managed by git.

▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬

Time Stamps
0:00 - Intro
0:32 - Classic Branch Setup
1:23 - Create Feature Branch
2:56 - Push Feature Branch
3:23 - Feature Merge Request
5:04 - Merge Tools
5:38 - Merged Feature
6:06 - Local Branch Cleanup
6:55 - Hotfix Branch
8:09 - Simplified Branch Setup
9:19 - Version Tagging
10:04 - Outro

▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬

Guided Learning -

▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬

Social Media -

#git #branch #infrastructureascode #continuousintegration #ci #iac #cloud #architecture #rest #api #graphql #automation #aws #gcp #azure #design #scripting #coding #operations #devops #git #gitops #containers #kubernetes #tech #technology #technical #pipeline #workflow

[Wahlnetwork]

As more of your infrastructure is defined using code stored in source control, a new challenge emerges - having a solid branching strategy. After all, the code will require patches, hotfixes, updates, new resources - there's a lot going on for your and your team to tackle. This video dives into branching strategies for Terraform code stored and managed by git.

[robwalker]

If like me you don't want to worry about managing version numbers all over the place you can implement git versioning with your cicd. By default it will just increment each commit as a patch. We tend to work in a branch in a Dev folder for each release. Then when ready to release do a semi linear merge to main/master and if it's not a patch we add +server:major or minor to the main commit message. This way you still get a nice history of all the commits and don't mess up versioning by increasing patch number widely

[BradleyHerbst]

I don't know why you didn't show how to do the non fast forward merge. You did a great job of showing everything else. Thanks for the video though.

[-Mai-Albarka]

You are the best man..just the video I needed to understand branching strategies

[rjk]

Really great stuff. Wondering though where qa fits in here. No qa branch?

[kierrereeg]

Great video thanks for the explanation!

[maximilianhagelstam]

Great video! Just what I was looking for!

[shenjason]

So, now i am in my feature branch, and i also merged the dev branch into my feature branch, and then everything is tested. now i need to merge my feature changes into release branch. what should i do now ? if i just merge my feature branch into release branch, then my merge will also contain other changes made by other people, which is not i want .. i don't want to contain other's changes. because maybethey havn't reviewed yet.

[sngle.mms]

Anyone else think he kinda cute tho (great video btw!)

[alexk]

thumb down for misleading title it should mention terraform