Programmer Humor

41828 readers

19 users here now

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.

founded 6 years ago

MODERATORS

cat_programmer@lemmy.ml

AgreeableLandscape@lemmy.ml

299

When you screw up git (lemmy.ml)

submitted 6 months ago by ericheese@lemmy.zip to c/programmerhumor@lemmy.ml

16 comments fedilink hide all child comments

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

[–] GissaMittJobb@lemmy.ml 8 points 6 months ago (5 children)

Use a rebase.

[–] chaospatterns@lemmy.world 9 points 6 months ago (4 children)

Rebase still means you have to resolve conflicts, but it can be worse because you may have to resolve conflicts across multiple commits that you're rebasing on top of a conflict.

[–] SavinDWhales@lemmy.world 10 points 6 months ago (1 children)

Do you know our Lord and Savior rerere?

(Though I rather squash most of the times)

[–] bungle_in_the_jungle@lemmy.world 5 points 6 months ago

Damn, you know... Over 15 years as a dev using git and understanding it fairly well and I'm still learning about new, handy things.

load more comments (2 replies)