1096

My Git Knowledge (lemm.ee)

submitted 3 months ago by sag@lemm.ee to c/programmer_humor@programming.dev

178 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[-] Anticorp@lemmy.world 31 points 3 months ago

If you're pushing to master, then you're doing it wrong.

[-] zalgotext@sh.itjust.works 24 points 3 months ago

Yeah main has been the defacto default branch name for like half a decade now

[-] TunaCowboy@lemmy.world 11 points 3 months ago

git whoosh --hard

[-] learningduck@programming.dev 5 points 3 months ago

Wait. It's that long?

Felt like we joke about the announcement 2 years ago. Time fly lol

[-] zalgotext@sh.itjust.works 1 points 3 months ago

Imma be honest I pulled that estimate out of my ass lol, but I feel like it was pre-pandemic? which would put it at at least 4 years ago and so holy shit I'm gonna go cry in a corner because it's been 4 years since the start of the pandemic

[-] throwwyacc@lemmynsfw.com 1 points 3 months ago

Isn't this only the case in github? All my repos are based from master, and I would assume that's because I init on the command line and push up to the remote?

[-] AA5B@lemmy.world 1 points 3 months ago

GitLab also changed a few years back. We host our own, so got the update later than people using the service … it was a bit of an argument at first since everyone wanted to stick with the familiar, but laziness won out. Unfortunately, it’s not really justifiable to go back and change legacy projects, so now it’s inconsistent

[-] throwwyacc@lemmynsfw.com 1 points 3 months ago

If you don't have any scripts that rely on branch name it should be pretty trivial actually. But I wouldn't be shocked if you had a few dozen scripts that nobody has looked at in the last century lol

[-] AA5B@lemmy.world 1 points 3 months ago

The question actually came up for a new tool to help automate dependency updates. Do we need to change the config to account for the inconsistency?

It turns out we don’t: it correctly uses the default branch, no matter what it’s called. However we had to consider the question. and investigate. It spent someone’s time

[-] Hawk@lemmynsfw.com 6 points 3 months ago

Why? I almost always have master/dev/stable.

[-] TunaCowboy@lemmy.world 8 points 3 months ago

You should not be pushing into your main/master/whatever branch.

All the main/master replies completely miss the point, further emphasizing sirsirsalot's statement.

[-] Hawk@lemmynsfw.com 1 points 3 months ago

I think I’ll keep doing it. It’s worked fine for the past decade 🤷

[-] Solemn@lemmy.dbzer0.com 1 points 3 months ago

It works fine for small projects. I think that with more than 2-3 devs a PR based strategy works better for enforcing review and just makes life easier in general, since you end up with less stuff like force pushes to fix minor things like whitespace errors that break everyone's local.