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.

[–] AnotherPenguin@programming.dev 2 points 18 minutes ago

hunter2

[–] slazer2au@lemmy.world 3 points 31 minutes ago

Chaotic Evil should be the current sha hash.

[–] normalexit@lemmy.world 1 points 14 minutes ago

Hey Linus did you merge my branch into mommy? I really want to get it out.

[–] locuester@lemmy.zip 19 points 2 hours ago

HEAD

[–] tiredofsametab@fedia.io 9 points 1 hour ago

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.

[–] GenosseFlosse@feddit.org 11 points 3 hours ago

It's master3. Don't question it!

[–] Aatube@kbin.melroy.org 9 points 4 hours ago (1 children)

prod

[–] kubica@fedia.io 1 points 23 minutes ago

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

[–] rtxn@lemmy.world 47 points 6 hours ago* (last edited 6 hours ago) (3 children)

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

[–] SeductiveTortoise@piefed.social 19 points 5 hours ago

Never merge. Only cherry pick.

[–] peoplebeproblems@midwest.social 10 points 5 hours ago

You have met every team I have ever worked with apparently

[–] NocturnalMorning@lemmy.world 7 points 6 hours ago (1 children)

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

[–] rtxn@lemmy.world 8 points 5 hours ago

I let the interns handle those. If they survive, they get bragging rights.

[–] GreenKnight23@lemmy.world 9 points 5 hours ago* (last edited 5 hours ago)

🤡 for master

👽 for test

💩 for dev

[–] palordrolap@fedia.io 12 points 6 hours ago

belay your panic. even mommy cannot save you.

"testing"

don't wake up. fourth row just dropped.

[–] danc4498@lemmy.world 5 points 5 hours ago (2 children)

Production made me lol

[–] Skullgrid@lemmy.world 3 points 3 hours ago

it's a one way ticket to having "who's on first?" problems

[–] ripcord@lemmy.world 2 points 4 hours ago

If you never pu5 anything into production then you never fail

[–] mercano@lemmy.world 11 points 6 hours ago (1 children)

“live” didn’t make it onto the list, I see.

[–] moosetwin@lemmy.dbzer0.com 9 points 6 hours ago* (last edited 6 hours ago) (1 children)

Looks like it died.

[–] sik0fewl@lemmy.ca 4 points 5 hours ago

Live and let die?

[–] FuglyDuck@lemmy.world 7 points 6 hours ago

"fuck it, it''s friday"

[–] independantiste@sh.itjust.works 7 points 6 hours ago (1 children)

release

[–] tamlyn@lemmy.zip 6 points 6 hours ago

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

[–] rem26_art@fedia.io 4 points 5 hours ago

nowadays, mommy

[–] Rhaedas@fedia.io 7 points 6 hours ago

"test"

[–] marsza@lemmy.cafe 3 points 5 hours ago (1 children)

Uhh, Daddy, obviously.

[–] untorquer@lemmy.world 1 points 14 minutes ago* (last edited 12 minutes ago)

I only push and pull daddy.

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

Both are great!

[–] Mithre@lemmy.world 2 points 5 hours ago

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

[–] UntouchedWagons@lemmy.ca 4 points 6 hours ago

Some of my repos on github use either main or master.