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

Progressive Enhancement for JS is overrated.

Progressive Enhancement for JS is overrated. In today’s web, HTML + CSS + JS is a package deal. Almost every browser supports the trio, and let’s be real: users expect apps to work smoothly with JavaScript. 95%+ of users have JS enabled – why build for the exception?...

read more

Alpine.js just clicked. 🎯

Alpine.js just clicked. 🎯 Its declarative syntax—attributes on HTML tags—is perfect for simple UI logic. Most of the time, I don’t even need to touch JavaScript. And when I do? I can write just a little bit, and it fits right in. What’s even better? The declarative...

read more

HTMX + ASPNET Core Razor = magic. ✨

HTMX + ASPNET Core Razor = magic. ✨ But HyperScript? Not so much. 😅 As a developer, I gave HyperScript a try for client-side interactions. I really wanted to love it—especially since it’s from the same creator as HTMX. But every time I used it, I spent way too much...

read more