this post was submitted on 12 Feb 2024
176 points (94.4% liked)

Programmer Humor

32070 readers
470 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] [email protected] 59 points 7 months ago (4 children)

“only one person per file”

so we’ve reverted back to the rcs/cvs days?

[–] [email protected] 11 points 7 months ago

GLADOS was already attempting to digitize employees. And we all know you don't concatenate employees, because the DIFFs become useless.

[–] [email protected] 7 points 7 months ago

welcome to Microsoft SourceSafe :)

[–] [email protected] 2 points 7 months ago

Well, this takes place in the Half Life/Portal universe where the world basically ended in the early 2000s, so it makes sense.

[–] [email protected] 2 points 7 months ago

We don’t even have that rule with CVS. Sometimes you have a merge conflict after cvs up, well then you fix it. That’s how it’s supposed to work.