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.

[–] UnfortunateShort@lemmy.world 11 points 1 week ago (1 children)

Joe who?

[–] Raptorox@sh.itjust.works 36 points 1 week ago

Joe mama

load more comments (1 replies)

[–] rtxn@lemmy.world 89 points 1 week ago* (last edited 1 week ago) (4 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 43 points 1 week ago

Never merge. Only cherry pick.

[–] peoplebeproblems@midwest.social 21 points 1 week ago

You have met every team I have ever worked with apparently

[–] NocturnalMorning@lemmy.world 12 points 1 week ago (1 children)

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

[–] rtxn@lemmy.world 17 points 1 week ago

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

[–] Rusty@lemmy.ca 3 points 1 week ago

Conflict resolution only through melee combat.

Wrestle with Jeff, Prepare for death.

[–] locuester@lemmy.zip 41 points 1 week ago

HEAD

[–] GenosseFlosse@feddit.org 31 points 1 week ago

It's master3. Don't question it!

[–] Aatube@kbin.melroy.org 28 points 1 week ago (1 children)

prod

[–] kubica@fedia.io 15 points 1 week ago (1 children)

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

[–] sp3ctr4l@lemmy.dbzer0.com 1 points 5 days ago

Stick with the prod, its always a good idea to prod with the prod, stick with the prod.

[–] mercano@lemmy.world 23 points 1 week ago (2 children)

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

[–] moosetwin@lemmy.dbzer0.com 19 points 1 week ago* (last edited 1 week ago) (1 children)

Looks like it died.

[–] sik0fewl@lemmy.ca 8 points 1 week ago

Live and let die?

load more comments (1 replies)

[–] tiredofsametab@fedia.io 20 points 1 week 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.

[–] AnotherPenguin@programming.dev 20 points 1 week ago (1 children)

hunter2

[–] Tja@programming.dev 28 points 1 week ago

Why would you name a branch just 7 asterisks?

[–] slazer2au@lemmy.world 17 points 1 week ago

Chaotic Evil should be the current sha hash.

[–] GreenKnight23@lemmy.world 16 points 1 week ago* (last edited 1 week ago)

🤡 for master

👽 for test

💩 for dev

[–] palordrolap@fedia.io 14 points 1 week ago

belay your panic. even mommy cannot save you.

"testing"

don't wake up. fourth row just dropped.

[–] neukenindekeuken@sh.itjust.works 14 points 1 week ago (1 children)

Develop should be Chaotic Evil.

[–] roanutil_@programming.dev 3 points 1 week ago (1 children)

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

load more comments (1 replies)

[–] Rhaedas@fedia.io 11 points 1 week ago

"test"

[–] Midnitte@beehaw.org 11 points 1 week ago

Feel like lawful evil fits better for master

[–] pelya@lemmy.world 10 points 1 week ago

It's goshujin-sama

[–] SkybreakerEngineer@lemmy.world 9 points 1 week ago

Yall have multiple branches?

[–] FuglyDuck@lemmy.world 9 points 1 week ago

"fuck it, it''s friday"

[–] independantiste@sh.itjust.works 9 points 1 week ago (1 children)

release

[–] tamlyn@lemmy.zip 13 points 1 week ago

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

[–] ZombiFrancis@sh.itjust.works 8 points 1 week ago (2 children)

"Untitled"

[–] xthexder@l.sw0.com 5 points 1 week ago

Untitled-project2_final_fixed-3.zip

[–] ronigami@lemmy.world 4 points 1 week ago

(empty string)

[–] marsza@lemmy.cafe 7 points 1 week ago (2 children)

Uhh, Daddy, obviously.

load more comments (2 replies)

[–] danc4498@lemmy.world 7 points 1 week ago (2 children)

Production made me lol

[–] Skullgrid@lemmy.world 4 points 1 week ago

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

[–] ripcord@lemmy.world 3 points 1 week ago

If you never pu5 anything into production then you never fail

[–] pohart@programming.dev 7 points 1 week ago* (last edited 1 week ago)

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.

[–] dosuser123456@programming.dev 6 points 1 week ago

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)

[–] UntouchedWagons@lemmy.ca 6 points 1 week ago

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

[–] rem26_art@fedia.io 6 points 1 week ago (1 children)

nowadays, mommy

load more comments (1 replies)

[–] cute_noker 6 points 1 week ago

Latest

[–] NigelFrobisher@aussie.zone 6 points 1 week ago (1 children)

Moab is “mouth over anus & balls”.

load more comments (1 replies)

[–] enbipanic@lemmy.blahaj.zone 5 points 1 week ago

Develop

[–] RiQuY@lemmy.zip 4 points 1 week ago

develop

[–] rozodru@lemmy.world 4 points 1 week ago

Khorne

[–] normalexit@lemmy.world 3 points 1 week ago

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

load more comments