cm0002 ( cm0002@lemdro.id ) to Programmer Humor@programming.devEnglish · 1 year agoWhen you screw up gitlemmy.zipimagemessage-square33linkfedilinkarrow-up1458
arrow-up1458imageWhen you screw up gitlemmy.zipcm0002 ( cm0002@lemdro.id ) to Programmer Humor@programming.devEnglish · 1 year agomessage-square33linkfedilink
minus-squaremavu ( mavu@discuss.tchncs.de ) linkfedilinkarrow-up2·1 year agoI 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.
minus-squaremere ( mere@lemmy.blahaj.zone ) linkfedilinkarrow-up2·1 year agoit’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
minus-squareenbiousenvy ( enbiousenvy@lemmy.blahaj.zone ) linkfedilinkEnglisharrow-up2·1 year agoit’s maybe more annoying in gamedev. textures, models are binary files that can’t be changed line-by-line.
minus-squareSleeplessCityLights ( SleeplessCityLights@programming.dev ) linkfedilinkarrow-up1·1 year agoIn game dev, a binary file conflict means someone is going to have to do their work a second time.
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.
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
it’s maybe more annoying in gamedev. textures, models are binary files that can’t be changed line-by-line.
In game dev, a binary file conflict means someone is going to have to do their work a second time.