In this article I will describe a Git workflow and branching model that I have used successfully in several projects and companies for many years now. It scales from small to large teams, and it fixes some common problems with Continuous Integration and GitFlow, for instance. Moreover, it is very simple and results in a nice Git …

This article tries to summarize some of the problems that I have come across when trying to use GitHub pull requests for doing code reviews. In summary: It was not all pleasant, and by the way I apologize for this rather harsh rant. The (single) good thing first The one thing that GitHub gets right …

This is a follow-up article to A tidy, linear Git history, going into more details of why I think that rewriting your Git commit history (i.e. rebasing) is usually the right thing to do. Two different history models When it comes to Git history (or any other version control system history, for that matter), there …

One of the things that is overlooked in many Git based projects is the value of a linear commit history. In fact, many tools and guidelines discourage Git workflows that aim for a linear history. I find this sad, since a tidy history is very valuable, and there is a straight forward workflow that ensures …