deleted by creator
- 0 Posts
- 20 Comments
elephantium@lemmy.worldto
Selfhosted@lemmy.world•Open Source Developers Are Exhausted, Unpaid, and Ready to Walk AwayEnglish
2·16 days agoYeah, it’s fairly clever but not actually magical. Sometimes you have to go in and take a look.
Actually, the real magic is that it works out mostly ok most of the time. Much better than older systems where you would have to “check out” a file to work on it which would lock others out. I’ve heard older programmers talk about needing to go find someone who had a file checked out and have them check it back in to enable them to do some work.
elephantium@lemmy.worldto
Selfhosted@lemmy.world•Open Source Developers Are Exhausted, Unpaid, and Ready to Walk AwayEnglish
4·17 days agoRoughly equal parts “git is clever” and “once in a while, someone has to take some time to figure it out”.
Say the code is split into two files. You and I both make changes, but you’re working on file A and I’m in file B. No problem!
Now we both make changes in file A. Sometimes Git can just “figure it out”, like if all your changes are in the beginning of the file, and all my changes are at the end.
But sometimes we both change the same section. Git can’t figure that part out, so one of us has to sit down and reconcile the changes. Sometimes this is pretty simple, other times…not so much.
Put it all together, and it works out pretty well most of the time.
elephantium@lemmy.worldto
memes@lemmy.world•Thankfully it wasn't an active shooterEnglish
3·2 months agoA tremendous cock up!
It’s a type of scarf.
Clit mouse?
elephantium@lemmy.worldto
Games@lemmy.world•EU tax officials confront the most pressing legal question of our time: If you sell RuneScape gold to someone and they use it to buy a magic sword, do you still have to pay taxes?English
2·2 months agoMany US states have sales tax, but I don’t think it counts as VAT.
Makes me think of sitcom tropes
This is what came to mind when I read the title:

elephantium@lemmy.worldto
memes@lemmy.world•If I did have a tumor, I'd name it Marla.English
1·5 months agoI want to argue, but I have to admit that your English is far better than my German.
Look at it this way, I’ll eat the stuff you don’t like so there’s more of the stuff you DO like!
Is it the name or the people that creeps you out?
Ok, but I’m an idiot with happy taste buds.
Oof, that’s a sobering realization.
This post is starting to make me think people say “strict” strictly as a euphemism.
What I think it means: The parents never bend the rules for their kids.
What it apparently means: The parents have anger problems.
elephantium@lemmy.worldto
memes@lemmy.world•What if you wanted to go to heaven but God saidEnglish
4·5 months agoKnowing is in the Biblical sense and comes after the entrance ceremonies!
For context, when I looked, there were less than 5 votes. So “more people” is really just “a couple of dogs”.
(Oh, wait, on the Internet, no one is supposed to know you’re a dog)