☆ Yσɠƚԋσʂ ☆@lemmy.ml to Programmer Humor@lemmy.mlEnglish · 11 months agoGit Ruleslemmy.mlimagemessage-square21fedilinkarrow-up1188arrow-down111
arrow-up1177arrow-down1imageGit Ruleslemmy.ml☆ Yσɠƚԋσʂ ☆@lemmy.ml to Programmer Humor@lemmy.mlEnglish · 11 months agomessage-square21fedilink
minus-squareBaby Shoggoth [she/her]@lemmy.blahaj.zonelinkfedilinkEnglisharrow-up59·11 months ago“only one person per file” so we’ve reverted back to the rcs/cvs days?
minus-square👍Maximum Derek👍@discuss.tchncs.delinkfedilinkEnglisharrow-up11·11 months agoGLADOS was already attempting to digitize employees. And we all know you don’t concatenate employees, because the DIFFs become useless.
minus-square☆ Yσɠƚԋσʂ ☆@lemmy.mlOPlinkfedilinkarrow-up9arrow-down2·11 months agowelcome to Microsoft SourceSafe :)
minus-squarePlzGivHugs@sh.itjust.workslinkfedilinkEnglisharrow-up2·11 months agoWell, this takes place in the Half Life/Portal universe where the world basically ended in the early 2000s, so it makes sense.
minus-squaresjmulder@lemmy.sdf.orglinkfedilinkarrow-up2·11 months agoWe 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.
“only one person per file”
so we’ve reverted back to the rcs/cvs days?
GLADOS was already attempting to digitize employees. And we all know you don’t concatenate employees, because the DIFFs become useless.
welcome to Microsoft SourceSafe :)
Well, this takes place in the Half Life/Portal universe where the world basically ended in the early 2000s, so it makes sense.
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.