Share
Report
162Hello Experts,
I want to understand from experts what their branching strategy is during upgrade.
Normal I have Dev and Main branch for support.
During upgrade, before upgrade starts, I branch out new MainP1 branch from Main branch for any P1s or code that is going to Prod. This will act as my code base for production till upgrade completes. As part of Upgrade, I upgrade the Dev first. Then merge code from Dev to Main branch. Build upgrade package from Main branch. For any Packages going to Production in the meanwhile , MainP1 will be used. Anycode that deployed to Production during upgrade is simultaneously merged main branch thus keeping it always in line with MainP1. Once prod is upgrade, MainP1 will not be used anymore and Main branch will once again start acting as code base for production packages going forward.
However, some developers use the below strategy during upgrade. In this first MainUpgrade is created as the first step of upgrade. Main barnch will continue as code base for production and any fixes or changes will be merged from Dev to Main and package for production will be build using Main. Upgrade will use MainUpgrade branch. Code and ISVs are upgraded in MainUpgrade branch. This branch is always kept in line with changes brought to Main branch. Package for Upgrade is build using MainUpgrade branch. Once production is upgraded, code is merged back to Main from MainUpgrade and then from Main to Dev.
My problem with the second strategy is that the merge back that happens after production upgrade. Something can always go wrong in this step. If something goes wrong, there is very less chance of catching it when next package for production is deployed to UAT and eventually package with problem can ends up in Production.
Where only issue with first approach that I can think of is that Dev and Main branches are upgraded, if someone did do the branching of MainP1 correctly then we might have problem.
What do you guys think? Which approach do you guys take and which is the best approach? Please do let me know if you take some other approach than above approaches.
Thank you,
Deepak.
Categories:
I have the same question (0)
All responses (
Answers (
