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.
Conflict resolution only through melee combat.
Wrestle with Jeff, Prepare for death.
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.
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.deleted by creator
Joe who?
Joe mama
HEAD
It’s master3. Don’t question it!
prod
I like prod because it makes less assumptions on stability. It is what is being used, good luck with the rest.
“live” didn’t make it onto the list, I see.
Looks like it died.
Live and let die?
It’s dead, Jim.
hunter2
Why would you name a branch just 7 asterisks?
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
Chaotic Evil should be the current sha hash.
belay your panic. even mommy cannot save you.
“testing”
don’t wake up. fourth row just dropped.
Developshould be Chaotic Evil.This is what is used where I work. I have never and will never understand why.
At some point in the past that was the only way to make the business run immediately when the boss said it needed to run immediately, and it’s been that way ever since
Feel like lawful evil fits better for master
It’s
goshujin-sama
