HI Team,
is it recommended to use Main branch only for stage and production deployment . or we can do a cutover as release branch and use the same for stage and production deployment so that any bug raised on stage env. we can use release branch to create bug fix branch and keeping Main branch just as parent
once production deployment is completed with no issues and request can be raised from pushed release branch to Main branch to sync also syncing the deployed release TAGS
Solved! Go to Solution.
Views
Replies
Total Likes
then you can use the main branch for deploying in STG and PROD
develop branch in DEV and QA
For bug fix you can create bugfix branches from main and merge to main in order to deploy in STG and PROD.
Once the deployment is completed reverse merge main into develop
You can do that but reverse merge can create problem because your next release branch that was created for dev/qa , might have conflicts.
What you can do is, use release branch to deploy in dev/qa and then merge release branch to main when ready for final deploy in stg and prod.
thanks @arunpatidar for responding
we have develop branch to push to QA env, so instead of using Main branch , can we do a cutover as release branch and use the same for stage and production deployment so that any bug raised on stage env. we can use release branch to create bug fix branch and keeping Main branch just as parent
otherwise if we use main branch for stg and prod , how we will be managing stg bugs fixes if raised , what will the flow of fixing it ?
then you can use the main branch for deploying in STG and PROD
develop branch in DEV and QA
For bug fix you can create bugfix branches from main and merge to main in order to deploy in STG and PROD.
Once the deployment is completed reverse merge main into develop
We have develop branch for dev env but for Stage and Prod we are using release branch and same rlease branch is configured at cloud manager deployment cycle to deploy on higher envs.
After that we merge release to main (with managed tags )after each successful release to prod.
@HeenaMadan - we also will be having similar setup , so once release branch cutover done for stage , while testing any bugs raised then what is the process
is it -
1st create a bugfix branch from develop and fix the the issues and deployed to QA env
then
create a bugfix branch from release and merge the same fixes to release branch and deployed to stage ?