You must log in or # to comment.
This summer - GIT OUT
I thought this was programmer humor, not programmer horror
My question would be for what time zone? That seems like an important detail
Well my pull request simplified all time zones to just UTC +8:45 so we never have to worry about it again
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?
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.
Merging all the feature branches in time is easy.
Having the project compile afterwards is hard.
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.
rm -rf * git add -A git commit -m "oops." rm -rf .git git init git add . git commit -m "bye." git push origin main --forcerm-ing.gitisn’t gonna work cuz you’ll have to re-add the remotes.Oh good point 🤦
So maybe instead, we can clear all local + remote branches and tags, create a blank branch, delete main, rename the blank branch to main, then delete .git
Although the OP says that we can merge anything, and we might not have access to mess with branches
Or just
git push origin --force blank:main
I’m not sure about the git history wipe, I can’t test it myself right now
Just test it on production, you could do it right now
Goodbye
fedecan.ca
