Spyke
lemmy.world

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.

115
lemmy.world

Branch on every commit. Never delete. If something needs to be rolled back, merge it back into HEAD. Conflict resolution only through melee combat.

90
lemmy.world

How have you survived in this world without exploding into a million little fiery merge conflicts?

12

Conflict resolution only through melee combat.

Wrestle with Jeff, Prepare for death.

3
kubicareply
fedia.io

I like prod because it makes less assumptions on stability. It is what is being used, good luck with the rest.

15

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.

20

belay your panic. even mommy cannot save you.

"testing"

don't wake up. fourth row just dropped.

14
roanutil_reply
programming.dev

This is what is used where I work. I have never and will never understand why.

3

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

2

we use git-flow in our company. So release is already another branch.

13

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.

7
untorquerreply
lemmy.world

I only push and pull daddy.

Wait shit this is programming so i could probably push and pull mommy too.

Both are great!

1

Our development branch is "working", then we have specific dated snapshots where we run our datasets through our programs.

3
What do you call your production branch? | Spyke