this post was submitted on 06 Oct 2025

834 points (96.7% liked)

Programmer Humor

26827 readers

2469 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

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 2 years ago

MODERATORS

Feyter@programming.dev

anzo@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

834

Well well well. (lemmy.ml)

submitted 4 days ago by ipconf@lemmy.ml to c/programmer_humor@programming.dev

133 comments fedilink hide all child comments

Yeah learned this the hard way.

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

[–] kibiz0r@midwest.social 9 points 4 days ago

Having to resolve the same conflict multiple times suggests excess noise in your git history. You might want to pay closer attention to creating a useful git history. It’ll help with any future archaeology, and it’ll also help rebasing go smoothly.