we use nvie gitflow as a template for our git forking strategy and follow it more or less closely enough.
The main difference is an intermediate environment that I have to integrate into my existing strategy.
This is pretty straight forward. Conducting is not much more than just a simple branch that we can combine with the new release branch. Point it to the source / stageerver and do what we want to do during the stage. So far, so good.
But let's say we find the material in the stage that we would like to fix (small corrections, perhaps even a bug in the newly integrated function?). It’s not yet clear to me what is a good strategy to resolve this matter.
My current ideas cover the following strategy:
- create staging_fix branch from source / stage
- correct mistakes
- repeat process + tests
- merging staging_fix branch with release branch
- Disable source exemption branch
- continue with gitflow according to nvie, therefore prepare the release branch for production, etc.
Do you think this is a good idea? This will lead to direct changes in the intermediate branch, which seems bright to me, because I would have to directly remake the intermediate environment - whatever you do with your production environment, and I want the setting to be as production-oriented as possible .
, . , .
? ?