697
Merge conflicts (feddit.nl)
you are viewing a single comment's thread
view the rest of the comments
[-] thejml@sh.itjust.works 6 points 6 days ago

Same here. Though it makes sense as we also cut a “release” branch that aid what goes to production and it’s behind protections against rogue PRs/commits so devs can’t just push there, the process must be followed. “Main” is for devs. “Release” is for prod. “Master” didn’t really jive with that layout so it’s gone.

[-] eager_eagle@lemmy.world 7 points 6 days ago* (last edited 6 days ago)

similarly, I use master and stable, it helps that PRs default to master, making changes to stable more intentional.

this post was submitted on 31 Jul 2025
697 points (100.0% liked)

Programmer Humor

25518 readers
1812 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 2 years ago
MODERATORS