I have a fairly large code base (a little under 50,000 LOC), and I've started thinking about what I'll do once I release this thing into the wild. It seems to me that the best thing I can do is branch the code while working on version 2.0; however I will also have to continue maintaining my 1.x release. This means that I will have to merge fixes between the two branches.
I'm wondering how does one go about merging code between code bases? Is it a mostly manual process or do the various Source Control products handle this in some fashion? If the source control utilities take care of this, how does it work? Is any particular source control program better at this than the others (as I currently use a rather manual method of source control, so I've not invested in any "real" solution.)? I am on a rather limited budget, so a open source/free solution would be preferred. If it makes any difference, this is all written in VB.NET and C#.
I'm wondering how does one go about merging code between code bases? Is it a mostly manual process or do the various Source Control products handle this in some fashion? If the source control utilities take care of this, how does it work? Is any particular source control program better at this than the others (as I currently use a rather manual method of source control, so I've not invested in any "real" solution.)? I am on a rather limited budget, so a open source/free solution would be preferred. If it makes any difference, this is all written in VB.NET and C#.
Facebook
Twitter