Due to management decision, a code freeze has been mandated to the main branch. 50 feature branches have accumulated waiting to be merged.
Management has now finally approved to lift the code freeze - but only for 24 hours. Will the poor engineering team manage to merge all feature branches in time?
Very easy: merge everything, fix after the feature freeze. It’s a feature freeze, not a bugfix freeze.
Edit: wait you said code freeze, my bad. Still, merge everything. If stuff doesn’t work after the freeze, management will unfreeze for fixes. Or they freeze a non-working product. Do stupid management, get stupid results. Not on me to make idiotic processes work.
Another movie pitch:
Due to management decision, a code freeze has been mandated to the main branch. 50 feature branches have accumulated waiting to be merged.
Management has now finally approved to lift the code freeze - but only for 24 hours. Will the poor engineering team manage to merge all feature branches in time?
Is there a robust test suite?
Merge, test, merge, test, patch, merge, test
Only some of the new code does. Unfortunately, most of the code base is 10 years old written in the good ol’ Anarchy Driven Programming paradigm.
The test suite takes 24 hours to run fully.
If by test you mean wait for customers to yell at us, it’s super robust
Merging all the feature branches in time is easy.
Having the project compile afterwards is hard.
Very easy: merge everything, fix after the feature freeze. It’s a feature freeze, not a bugfix freeze.
Edit: wait you said code freeze, my bad. Still, merge everything. If stuff doesn’t work after the freeze, management will unfreeze for fixes. Or they freeze a non-working product. Do stupid management, get stupid results. Not on me to make idiotic processes work.
Merge/test/fix on a separate branch and then merge this into main when the freeze lifts?