Category Archives: Branch-Per-Feature

Git: D’oh! I Meant To Create A New Branch First!

Yesterday I ran into a situation with git where I was working away on some code, finished what I was doing and committed the changes. Immediately after making the commit, I realized that I was still sitting in my master … Continue reading 

Also posted in Command Line, Git, Source Control | 8 Comments

Branching Strategies: Handling Dependencies Between Branches

Every system evolves over times. There’s no way around this and there is no reasonable/certain/real way to think ahead 100% of the time. It’s simply not possible to predict every possible outcome or issue or situation. This change affects every … Continue reading 

Also posted in Branching Strategies, Principles and Patterns, Source Control | 3 Comments

Branching Strategies: The Cost Of Branching And Merging

Branching and merging are never free operations. Even if you are using a source control system that makes the mechanical process of branching and merging negligible, there are other costs that need to be accounted for than just the button … Continue reading 

Also posted in Branching Strategies, Productivity, Source Control, Test Automation | 4 Comments

Branching Strategies: When To Branch And Merge

At a very high level, all branching strategies have the same core policies: create the branch when you are confident that the cost of branching and merging is less than the cost of committing to the main source line, and … Continue reading 

Also posted in Branching Strategies, Git, Source Control, Subversion | Leave a comment

Branch-Per-Feature: How I Manage Subversion With Git Branches

Anyone that follow me on twitter likely knows that I’m a big fan of Git these days. I’ll spare you the gushing heart felt nausea of how it’s so awesome  and skip right to the point, though: I don’t always … Continue reading 

Also posted in Git, Source Control, Subversion | 10 Comments

Branch-Per-Feature Source Control. Part 2: How (Theory)

In the first part of my Branch-Per-Feature (BPF) series, I talked about why you would want to use a source control strategy like BPF – what circumstances would warrant such a strategy, what problems it solves, and a little bit … Continue reading 

Also posted in Continuous Integration, Git, Management, Principles and Patterns, Smoke Test, Source Control, Subversion, Workflow | 13 Comments

Branch-Per-Feature Source Control. Part 1: Why

Several years ago, I started using source control systems to store all of my code. It was a life saver. I was no longer worried about losing changes that I had made. Then a few years ago, I found Subversion. … Continue reading 

Also posted in Continuous Integration, Git, Management, Productivity, Quality, Source Control, Standardized Work, Subversion, Workflow | 16 Comments

Branch-Per-Feature Source Control. Introduction

Update: I have used the term ‘branch-per-feature’ very loosely until recently. It was a catchy name, easy to remember, and got the point across. However, this is only one example of what is really a branching strategy.  A branching strategy … Continue reading 

Also posted in Agile, Branching Strategies, Continuous Integration, Git, Source Control, Standardized Work, Subversion, Workflow | 8 Comments