What about
joe? Because the engineer who bootstrapped the project mistakenly put his name as the mainline branch and we realized it far too late during the lifecycle and the team decided to keep the branch name because it’s hilarious.Joe who?
Joe mama
Yall have multiple branches?
Branch on every commit. Never delete. If something needs to be rolled back, merge it back into HEAD. Conflict resolution only through melee combat.
Never merge. Only cherry pick.
You have met every team I have ever worked with apparently
How have you survived in this world without exploding into a million little fiery merge conflicts?
I let the interns handle those. If they survive, they get bragging rights.
It’s master3. Don’t question it!
“Untitled”
Untitled-project2_final_fixed-3.zip
(empty string)
Developshould be Chaotic Evil.qa.
All development happens in feature branches. Someone other than the original developer needs to build and test the feature on our development servers. If successful it gets merged into qa, where it gets built and tested against it qa servers. Production build are tags on qa.
branch (i always commit directly to the main branch so i only have one, so why bother naming it. also YOU CANT STOP ME FROM DOING IT BWAHAHAHAHAHA)
“test”
Chaotic Evil should be the current sha hash.
Moab is “mouth over anus & balls”.
Even better
Boring answer: older repos are master, newer ones are main. I’ve worked at companies that did other things such as having the prod branch be a branch called prod.
🤡 for master
👽 for test
💩 for dev
HEAD
Main is QA. Production is release branches.
