- 10 months
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. - 10 months
Branch on every commit. Never delete. If something needs to be rolled back, merge it back into HEAD. Conflict resolution only through melee combat.
- 10 months
You have met every team I have ever worked with apparently
- 10 months
How have you survived in this world without exploding into a million little fiery merge conflicts?
- 10 months
I let the interns handle those. If they survive, they get bragging rights.
- Rusty@lemmy.caEnglish10 months
Conflict resolution only through melee combat.
Wrestle with Jeff, Prepare for death.
- 10 months
I like prod because it makes less assumptions on stability. It is what is being used, good luck with the rest.
10 monthsStick with the prod, its always a good idea to prod with the prod, stick with the prod.
- 10 months
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.
- 10 months
belay your panic. even mommy cannot save you.
“testing”
don’t wake up. fourth row just dropped.
- 10 months
This is what is used where I work. I have never and will never understand why.
- 10 months
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
