Git makes working with branches extremely easy. Especially compared to many of the version control systems that came before it. This has resulted in a standard workflow involving feature branches. The idea is to branch from master when you begin developing a new feature. You do all of your development on that branch. When the… Read More »
This is another post in my intermittent series of Best Practices Gone Bad (BPGB) Today, we are going to take another side-step into version control. Most development groups use version control of some form. Whether you prefer Subversion, Git, Mercurial, Bazaar, Clear Case, or any of the many others, version control is an important technique… Read More »
The past few generations of version control systems have really good support for branching. This feature allows someone to create a new line of development that is separate from the official main/master/trunk line of development. Changes made on a branch do not affect the main development until they are merged to the main branch. Shortly… Read More »
Despite the press in recent years asserting the software development is always a team activity, there are still individual programmers building software without help from others. I’ve recently had a question from one such individual asking if version control makes sense for a developer working alone. Despite working in teams for years, I also work… Read More »
There has been a lot of talk lately about projects moving to git. So far I the write-ups from people converting to git have all been glowing endorsements of the new one, true way. There’s almost a religious fervor related to the subject. Since my experience has not been quite that good, I thought it… Read More »
Software Configuration Management Patterns Stephen P. Berczuk and Brad Appleton Addison-Wesley, 2003 The first three chapters define the problem space. We get a solid description of Software Configuration Management (SCM) and an introduction to patterns and pattern languages. This section of the book sets up the context that you will need to understand the rest.… Read More »
Every now and then, I manage to pull myself away from reading and reviewing computer books (my hobby for the last year) or programming (my hobby for … never mind), and spend a little time on various weblogs. It’s important to see what the names in the field are thinking and talking about. During one… Read More »
In Conversion to Subversion: Tags, I explained how I cleaned up the tags portion of the CVS dump file in order to generate a subversion repository in the format I wanted. Lars Mentrup emailed to say that I had not been clear enough on a few points. After re-reading what I wrote, I have to… Read More »
In the first article of this series, Conversion to Subversion, Part I, I described the problem I found in trying to convert a project from my CVS repository to Subversion. In my last article, Conversion to Subversion: The Project’s Trunk, I described the solution that I used to convert a basic project with no tags… Read More »
In Conversion to Subversion, Part I, I described the problems I found when I began converting my CVS repository to Subversion. In this article, I describe the work and surprises that came from the first project migration. My first idea was to build the repository from the dump file and then fix the result using… Read More »