this post was submitted on 23 Nov 2023
219 points (96.2% liked)

Programmer Humor

32070 readers
713 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS
AgreeableLandscape@lemmy.ml
cat_programmer@lemmy.ml
219
git discussion bingo (media.mas.to)
submitted 10 months ago by yogthos@lemmy.ml to c/programmerhumor@lemmy.ml
33 comments fedilink hide all child comments
 
all 38 comments
sorted by: hot top controversial new old
[–] vettnerk@lemmy.ml 33 points 10 months ago (1 children)

"Git is to github what porn is to pornhub"

[–] darcy@sh.itjust.works 2 points 10 months ago (1 children)

or you to youtube...

[–] lemmesay@discuss.tchncs.de 2 points 9 months ago

to YouTube, you're youseless if you're yousing youBlock origin.

[–] wisplike_sustainer@suppo.fi 26 points 10 months ago (1 children)

I almost got a bingo by checking off things I've muttered to myself.

[–] xmunk@sh.itjust.works 8 points 10 months ago (2 children)

I would've... but mercurial isn't better.

As an aside, stop merging into in-progress private branches.... it makes the absolute worst conflicts.

[–] Dirk@lemmy.ml 2 points 10 months ago

[rebase needed]

[–] steph@lemmy.clueware.org 0 points 10 months ago* (last edited 10 months ago) (1 children)

I've had that kind of reaction - on rebases also - and most times it was in fact a code smell pointing to a case of spaghetti code.

If you get to the point that you fear upstream merges/rebases into your WIP, stop for a second and ask yourself if maybe that might be an issue with too much interpendencies inside the code itself. Code should be as close to an directed acrylic graph as possible. (doesn't count, I was not speaking of git! :b )

[–] eclectic_electron@sh.itjust.works 2 points 10 months ago (1 children)

What's your workflow that merging into other people's WIP is normal? I'm so confused

[–] steph@lemmy.clueware.org 2 points 10 months ago

A merge from upstream once a day, at the beginning of the day.

I'm working on a DevOps setting, and even though we're a small team, we have about two to three changes going through the pipeline a day.

If you keep your fork too long without syncing, it just get more complicated to merge, and more importantly if you need help from the upstream change author they'll have moved on to another subject and the change won't be as fresh in their mind as if you had merged the day after they pushed it.

[–] vext01@lemmy.sdf.org 7 points 10 months ago (1 children)

I propose: "how the f**k do i discard submodule changes"

[–] flashgnash@lemm.ee 4 points 10 months ago

Delete the entire directory and re clone it of course

[–] cupcakezealot@lemmy.blahaj.zone 6 points 10 months ago (1 children)

commits are immutable snapshots

git interactive rebase enters, stage right

[–] aspirate2959@sh.itjust.works 4 points 10 months ago

Which makes a new commit. The old commit before the rebase is still there until it's garbage collected. Editing a commit in any way changes its hash, turning it into a new commit.

[–] synae@lemmy.sdf.org 6 points 10 months ago (1 children)

I checked a lot of them, but no bingo. scattered all over

[–] nilloc@discuss.tchncs.de 3 points 10 months ago

I’ve said both subversion was better, and worse before for sure. PTSD is making it hard to remember what I’ve said when trying to remove a PSD of mpeg you accidentally committed in the first commit and just noticed as you cloned the repo home and it was 2gb for a 3 page website.

[–] Ilflish@lemm.ee 5 points 10 months ago* (last edited 10 months ago)
  • Make Structured Commits by context
  • Make a MR
  • Forgot to Rebase
  • Close MR
  • Rebase
  • Make a MR
  • Forgot to push the Rebase so now all Rebase items are on my MR
  • Close MR
  • Reset Changes
  • Push Rebased Items
  • Make Structured Commits,
  • Forget a file
  • Reset Changes
  • Make a mega Commit
  • Make a MR
  • Pipeline fails
[–] Cysioland@lemmygrad.ml 4 points 10 months ago (1 children)

git is a blockchain without a proof of work

[–] sim642@lemm.ee 1 points 10 months ago (1 children)

The proof of work is the commit content itself! Unlike some arbitrary brute force task of no value.

[–] Cysioland@lemmygrad.ml 2 points 10 months ago

In some cases it's "proof of slacking off"

[–] KingThrillgore@lemmy.ml 3 points 10 months ago* (last edited 9 months ago)

I love git until it backfires which at that point I fucking hate git

[–] mdhughes@lemmy.ml 2 points 10 months ago (1 children)

I get more than half the spaces, all the negative ones, but can't quite make a bingo without the center, which is the kind of pro-giving a shit about git nonsense I'd never utter.

I miss subversion and perforce.

[–] Piatro@programming.dev 1 points 10 months ago

My friend and I are looking to make a game and the general consensus has been that perforce is still better than git LFS, so we're setting up a perforce server. What is it about SVN and perforce that you miss? I've only ever used git professionally for VCS so I'm finding perforce's always-online and exclusive-checkouts model just very strange (though I understand the need for it when working with binary files).

[–] Dirk@lemmy.ml 2 points 10 months ago

force push for release

[–] ExLisper@linux.community 2 points 10 months ago (1 children)

I've been using git for 20 years and have no idea how it works. Probably will be the next things I will do a deep dive into.

[–] PeriodicallyPedantic@lemmy.ca 1 points 10 months ago (1 children)

I stand by my opinion that git should be the what VCS software uses internally and is built on. It's an API for VCS developers to use. And repon admins.

Thev actual VCS should have it's own API and CLI that is intuitive and shouldn't require understanding the underlying data structure.

[–] Kache@lemm.ee 3 points 10 months ago (1 children)

If that's what you're looking for, then: https://gitless.com/

[–] PeriodicallyPedantic@lemmy.ca 1 points 10 months ago

That is what I want. Now if only it was more widespread and my employer allowed it lol