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.
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.
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
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.
59 Comments
sheogorath@lemmy.world · 115 pts · 363d
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 · 12 pts · 363d
Joe who?
Raptorox@sh.itjust.works · 38 pts · 363d
Joe mama
MonkderVierte@lemmy.zip · 1 pts · 363d
rtxn@lemmy.world · 90 pts · 363d
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 · 45 pts · 363d
Never merge. Only cherry pick.
peoplebeproblems@midwest.social · 21 pts · 363d
You have met every team I have ever worked with apparently
NocturnalMorning@lemmy.world · 12 pts · 363d
How have you survived in this world without exploding into a million little fiery merge conflicts?
rtxn@lemmy.world · 17 pts · 363d
I let the interns handle those. If they survive, they get bragging rights.
Rusty@lemmy.ca · 3 pts · 362d
Wrestle with Jeff, Prepare for death.
locuester@lemmy.zip · 41 pts · 363d
HEAD
GenosseFlosse@feddit.org · 31 pts · 363d
It's master3. Don't question it!
Aatube@kbin.melroy.org · 29 pts · 363d
prod
kubica@fedia.io · 15 pts · 363d
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 pts · 359d
Stick with the prod, its always a good idea to prod with the prod, stick with the prod.
mercano@lemmy.world · 24 pts · 363d
“live” didn’t make it onto the list, I see.
moosetwin@lemmy.dbzer0.com · 19 pts · 363d
Looks like it died.
sik0fewl@lemmy.ca · 8 pts · 363d
Live and let die?
leftzero@lemmy.dbzer0.com · 2 pts · 363d
It's dead, Jim.
AnotherPenguin@programming.dev · 20 pts · 363d
hunter2
Tja@programming.dev · 29 pts · 363d
Why would you name a branch just 7 asterisks?
tiredofsametab@fedia.io · 20 pts · 363d
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.
slazer2au@lemmy.world · 17 pts · 363d
Chaotic Evil should be the current sha hash.
GreenKnight23@lemmy.world · 16 pts · 363d
🤡 for master
👽 for test
💩 for dev
palordrolap@fedia.io · 14 pts · 363d
belay your panic. even mommy cannot save you.
"testing"
don't wake up. fourth row just dropped.
neukenindekeuken@sh.itjust.works · 14 pts · 362d
Developshould be Chaotic Evil.roanutil_@programming.dev · 3 pts · 362d
This is what is used where I work. I have never and will never understand why.
ghen@sh.itjust.works · 2 pts · 362d
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
Rhaedas@fedia.io · 11 pts · 363d
"test"
pelya@lemmy.world · 10 pts · 363d
It's
goshujin-samaSkybreakerEngineer@lemmy.world · 9 pts · 362d
Yall have multiple branches?
FuglyDuck@lemmy.world · 9 pts · 363d
"fuck it, it''s friday"
independantiste@sh.itjust.works · 9 pts · 363d
release
tamlyn@lemmy.zip · 13 pts · 363d
we use git-flow in our company. So release is already another branch.
ZombiFrancis@sh.itjust.works · 8 pts · 362d
"Untitled"
xthexder@l.sw0.com · 5 pts · 362d
Untitled-project2_final_fixed-3.zip
ronigami@lemmy.world · 4 pts · 362d
(empty string)
Midnitte@beehaw.org · 7 pts · 362d
Feel like lawful evil fits better for master
pohart@programming.dev · 7 pts · 362d
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.
danc4498@lemmy.world · 7 pts · 363d
Production made me lol
Skullgrid@lemmy.world · 4 pts · 363d
it's a one way ticket to having "who's on first?" problems
ripcord@lemmy.world · 3 pts · 363d
If you never pu5 anything into production then you never fail
marsza@lemmy.cafe · 7 pts · 363d
Uhh, Daddy, obviously.
untorquer@lemmy.world · 1 pts · 363d
I only push and pull daddy.
Wait shit this is programming so i could probably push and pull mommy too.
Both are great!
marsza@lemmy.cafe · 2 pts · 363d
I’d
npm run watchyou git push origin daddydosuser123456@programming.dev · 6 pts · 362d
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)
NigelFrobisher@aussie.zone · 6 pts · 362d
Moab is “mouth over anus & balls”.
hellfire103@lemmy.ca · 1 pts · 362d
Even better
cute_noker@feddit.dk · 6 pts · 363d
Latest
rem26_art@fedia.io · 6 pts · 363d
nowadays, mommy
Cevilia@lemmy.blahaj.zone · 2 pts · 362d
UntouchedWagons@lemmy.ca · 6 pts · 363d
Some of my repos on github use either main or master.
enbipanic@lemmy.blahaj.zone · 5 pts · 363d
Develop
RiQuY@lemmy.zip · 4 pts · 363d
develop
rozodru@lemmy.world · 4 pts · 362d
Khorne
normalexit@lemmy.world · 3 pts · 363d
Hey Linus did you merge my branch into mommy? I really want to get it out.
Nomecks@lemmy.ca · 3 pts · 363d
Main is QA. Production is release branches.
Mithre@lemmy.world · 3 pts · 363d
Our development branch is "working", then we have specific dated snapshots where we run our datasets through our programs.
mitchty@lemmy.sdf.org · 2 pts · 359d
I’m using shenanigans now, fits the best methinks.
DrunkAnRoot@sh.itjust.works · 2 pts · 363d
smirnoffcarkeysandabeer
MonkderVierte@lemmy.zip · 1 pts · 363d
Evolution names like "mammal".