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

[–] mavu@discuss.tchncs.de 2 points 10 months ago* (last edited 10 months ago) (2 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 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.

[–] enbiousenvy@lemmy.blahaj.zone 2 points 10 months ago (1 children)

it's maybe more annoying in gamedev. textures, models are binary files that can't be changed line-by-line.

[–] SleeplessCityLights@programming.dev 1 points 10 months ago

In game dev, a binary file conflict means someone is going to have to do their work a second time.