56 points

“Git is to github what porn is to pornhub”

permalink
report
reply
2 points

or you to youtube…

permalink
report
parent
reply
2 points

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

permalink
report
parent
reply
39 points

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

permalink
report
reply
12 points

I would’ve… but mercurial isn’t better.

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

permalink
report
parent
reply
2 points

[rebase needed]

permalink
report
parent
reply
2 points
*

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 )

permalink
report
parent
reply
2 points

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

permalink
report
parent
reply
9 points

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

permalink
report
reply
3 points

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.

permalink
report
parent
reply
9 points

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

permalink
report
reply
5 points

Delete the entire directory and re clone it of course

permalink
report
parent
reply
6 points

commits are immutable snapshots

git interactive rebase enters, stage right

permalink
report
reply
4 points

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.

permalink
report
parent
reply

Programmer Humor

!programmerhumor@lemmy.ml

Create post

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

Rules:

  • Posts must be relevant to programming, programmers, or computer science.
  • No NSFW content.
  • Jokes must be in good taste. No hate speech, bigotry, etc.

Community stats

  • 5.1K

    Monthly active users

  • 1.5K

    Posts

  • 33K

    Comments