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
- 0 Posts
- 19 Comments
mere@lemmy.blahaj.zoneto Programmer Humor@programming.dev•I'm not sure, but it might be something about UUIDs1·2 days agoare you from the UK by any chance
mere@lemmy.blahaj.zoneto Mildly Infuriating@lemmy.world•Microsoft doing shady Microsoft stuff againEnglish2·15 days agoahaha i remember now, thanks - i wish the tag were universal though :D
mere@lemmy.blahaj.zoneto Mildly Infuriating@lemmy.world•Microsoft doing shady Microsoft stuff againEnglish2·16 days agooh yeah i made that one comment - what was the original comment i was replying to again? i can’t remember and the post seems to have been deleted. (also do i actually have that tag or are you kidding? i can’t see it)
mere@lemmy.blahaj.zoneto Programmer Humor@programming.dev•How I, a non-developer, read the tutorial you, a developer, wrote for me, a beginner - annie's blog71·17 days agoas of right now the second xkcd you linked is in an identical format to the newest xkcd. Not relevant to the post, just think it’s cool
we will NOT have any queen disrespect in this house >:(
this is the only correct answer
oh my god this is the best thing i’ve listened to in years
I am going to commit a hate crime
mere@lemmy.blahaj.zoneto Mildly Infuriating@lemmy.world•Microsoft doing shady Microsoft stuff againEnglish6·17 days agonix>>>
although have you considered gentoo?
oops yeah brain fart sorry
it’s de-obfuscated, a human didn’t write it (in that form) thankfully
no, for that you get a dumb analogue clock
mere@lemmy.blahaj.zoneto Not The Onion@lemmy.world•Trump to host UFC cage fight on White House lawn to mark 250 years of US independenceEnglish7·1 month agoSaw the title and was like ‘haha funny, imagine’. Then ‘wait, it’s not satire??’
mere@lemmy.blahaj.zoneto People Twitter@sh.itjust.works•Bro these racists are so embarrassing11·1 month ago‘bone petite’ these people aren’t REAL
mere@lemmy.blahaj.zoneto Not The Onion@lemmy.world•Florida Deploys Police To Stare At Crosswalks, Stop Them From Being Painted Rainbow ColorsEnglish121·2 months ago…a mass shooting that took place LESS THAN A DECADE AGO
mere@lemmy.blahaj.zoneto Malicious Compliance@lemmy.world•I highlighted the VPN part so that everyone knows to not use themEnglish2·2 months agoI’m an idiot, the image was broken so I opened it in a new tab and was extremely confused as to why I was being ‘blocked’ even with a vpn active
mere@lemmy.blahaj.zoneto Programmer Humor@lemmy.ml•Child labour with 10 years of experience, 'AI-native' accepting 250k lines of Cursor code5·2 months agoliterally cracked
HOLY SHIT THAT’S SO GOOD??