cm0002@lemdro.id to Programmer Humor@programming.devEnglish · 1 month agoWhen you screw up gitlemmy.zipimagemessage-square66linkfedilinkarrow-up1795
arrow-up1795imageWhen you screw up gitlemmy.zipcm0002@lemdro.id to Programmer Humor@programming.devEnglish · 1 month agomessage-square66linkfedilink
minus-squaremavu@discuss.tchncs.delinkfedilinkarrow-up3·edit-21 month 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@lemmy.blahaj.zonelinkfedilinkarrow-up4·1 month 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-squaredream_weasel@sh.itjust.workslinkfedilinkarrow-up1·1 month agoSounds like agreement and resolution are required pre merge conflict resolve.
minus-squareenbiousenvy@lemmy.blahaj.zonelinkfedilinkEnglisharrow-up2·1 month agoit’s maybe more annoying in gamedev. textures, models are binary files that can’t be changed line-by-line.
minus-squareSleeplessCityLights@programming.devlinkfedilinkarrow-up1·1 month 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
Or 3 branches…
Sounds like agreement and resolution are required pre merge conflict resolve.
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.