Only on the commerce cloud projects, it goes like this: When branches are ready to deploy to production:
- create a release/[yyyymmdd] branch (e.g. release/20220315) from git master
- merge feature branches that are ready to deploy to this release branch (push release branch to git repo)
- merge the release branch to git production (push git production up to repo)
- merge git production to cloud production
- merge git production to git master
- optional: merge cloud production to cloud master
for all the other "on-premise" projects, we
- merge feature branch to master
- merge master branch to env/production