This is the third article in a series where I discuss how I dealt with the challenge of maintaining two separate but similar web sites in source control. This kind of scenario doesn’t really follow the Version->Maintenance->Next Version linear development process. Instead, it has common code and separate themes.
In article one, I talked about [...]
Archive for the 'Branching and Merging' Category
In a previous article, I discussed with you how I might deal with the challenge of maintaining two separate but similar web sites in a Mercurial source control system. These sites don’t really follow the Version->Maintenance->Next Version linear development process. Instead, they have common code and separate themes. I mentioned three options [...]
I was stuck in a strange situation today. Typically in software development, branches are used for “one offs” – such as a maintenance branch off of a major line of code.
My dilemma today was slightly different. I have an existing web site and I need to make a some-what duplicate of it for [...]