Decoding Git Branching: Less is More!

by Jul 6, 2023

Decoding Git Branching: Less is More!

Easy and powerful – that’s Git branching for me. I went on a journey with GitFlow branching strategy only to realize its complexity and pivoted to GitHub Flow.

Now I am even more extreme, with almost no branches, using Trunk-based development.

Reason? Branches aren’t free of cost. 💰

More branches = longer feedback loops, slowed code reviews and merges. 🔄 Result? Delayed integrations and slower deployments.

Too many branches clutter the codebase, hampering collaboration and comprehension. 🧠

Increased branches amplify the chances of conflicts, destabilizing your codebase. ⚠️

Start simple, with feature branches on the main branch. 🌳 But consider this – why create a branch for a feature that can be built in one day?

Git branching is valuable, but excessive use can hinder software development. Keep it focused and concise for better results. 🎯

#
Remy van Duijkeren

Remy van Duijkeren

Power Platform Advisor

Microsoft Power Platform Advisor with over 25 years of experience in IT with a focus on (marketing) automation and integration.

Helping organizations with scaling their business by automating processes on the Power Platform (Dynamics 365).

Expert in Power Platform, Dynamics 365 (Marketing & Sales) and Azure Integration Services. Giving advice and strategy consultancy.

Services:
– Strategy and tactics advise
– Automating and integrating

Subscribe to
The Daily Friction

A daily newsletter on automation and eliminating friction

Related Content

Backlog: The Black Hole of ideas

Backlog: The Black Hole of ideas Is your backlog turning into an ever-expanding universe of forgotten dreams? We all know that mix—a jumble of big ideas and tiny tasks waiting for their day in the sun. Some items linger for years. Why do backlogs grow? Because we...

read more

The Trade-off Between Budgets and Quality ⚖️

The Trade-off Between Budgets and Quality ⚖️ In my previous post, I talked about shifting from Estimates to Budgets for feature development 💡. Let's dive deeper. Using a Budget instead of an Estimate introduces a trade-off: Scope and Quality adjust to fit the time...

read more

Budgets instead of Estimates

Budgets instead of Estimates Estimating a feature is difficult and is often a guess (or even a lie). An Estimate is for a fixed scope. So, you need to think deeply how to implement the feature, before giving an Estimate. The business can then use the Estimate to...

read more