Programmer Humor

32799 readers

570 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 3 years ago

MODERATORS

790

submitted 10 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

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

Or 3 branches..

[–] dream_weasel@sh.itjust.works 1 points 10 months ago

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