We’re about to begin the process of re-styling our very old Classic ASP site to a more modern look and I was curious about a branching strategy, since we’ll still need to maintain the existing code in Production until the re-style project is completed.
In the past, we’ve mainly used SVN, so I’m not very familar with Git and wanted to get some input on how we should handle this project.
Based on an article I read, it indicated we should use master for the main re-style project, then create a maint branch to support the current Production release.
Using the above strategy, it seems that any changes made to the maint branch would then be merged upstream into master.
That article also indicated having a next branch as a testing branch for topics/features being tested for stability for master. It also mentioned a pu branch for proposed updates. I don’t think we need either of these do we?
If none of this is correct, I’m open to input on the best way to proceed.