Programmer Humor

28058 readers

945 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

founded 2 years ago

MODERATORS

754

submitted 2 months ago by cm0002@lemdro.id to c/programmer_humor@programming.dev

65 comments fedilink hide all child comments

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

[–] mavu@discuss.tchncs.de 2 points 2 months ago* (last edited 2 months ago) (5 children)

I don't get why people have such problems with this they even make memes about it.

Have you people never merged anything by hand or what? It's really not hard.

[–] mere@lemmy.blahaj.zone 4 points 2 months 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

[–] tomjuggler@lemmy.world 2 points 2 months ago

Or 3 branches..

load more comments (1 replies)

load more comments (3 replies)