this post was submitted on 11 Oct 2025

754 points (99.3% liked)

Programmer Humor

programmer_humor@programming.dev

34,043 readers

8,138 active

1,496 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
- If the mod doesn't find it funny, you're banned. Ha-ha!... For real: do not use the community for "statements". There are other places for such content. Keep it chill and funny.

founded 3 years ago

moderators

anzo@programming.dev

Feyter@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

When you screw up git (lemmy.zip)

submitted 1 year ago by cm0002@lemdro.id to c/programmer_humor@programming.dev

57 comments fedilink hide all child comments

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

[–] mere@lemmy.blahaj.zone 4 points 1 year ago (2 children)

it's fine for simple merge conflicts but it quickly gets messy when the two branches are trying to do opposite things to the same code

parent

hideshow 2 child comments

[–] tomjuggler@lemmy.world 2 points 1 year ago

Or 3 branches..

parent

[–] dream_weasel@sh.itjust.works 1 point 1 year ago

Sounds like agreement and resolution are required pre merge conflict resolve.

parent