《上下文》Git 大师与一个 API 开发新手站在拥挤喧嚷的办公室内。
“我正试图合并两个巨大的 XML 文件，”API 新人解释道，“但现在出现了海量的合并冲突。大师，对于这类问题，您一定有个得当的策略（strategy），可以将两个文件的各行以人类可读的形式相互对应起来。我应该怎么办？”
“但我手工解决冲突已经花了了好几个小时了！”API 开发者抗议道。“mergetool 作为合并的工具，理应具有判断上下文对齐行号的功能！”
数个小时过后，Git 大师回到房间。沉默的办公室空无一人，只有 API 开发者还坐在屏幕前，垂着头向合并冲突投降。
$ git merge --strategy-option=耐心（patience）
Jump on the Equifax leak claim wagon. You get $125 in the settlement, automatically. ALSO, you can be compensated at the rate of $25 per hour for time spend remediating their fuckup, and only have to provide documentation if you spent more than 10 hours unfucking them. The official claim site is https://www.equifaxbreachsettlement.com/
Someone from Cisco went on stage to propose weakening TLS 1.3 for "network-based security solutions" (enterprise spyware).
There was a long line at the mic of people pushing back on it... I almost felt bad for the poor speaker 🙂
@outvi Further investigation show that seems to be also a problem related to mail service provider.
In addition to those GitHub spammers, another bunch of stupid Chinese companies are scanning "git log" of torvalds/linux.git, days and nights. You got a patch merged into the mainline by Greg K.H, and you have a Chinese sign-off name?
Congrats! You'll get automated spams immediately: We offers top job opportunities for experts like you (lol, I don't even believe myself is one), blabla.
EVERY SINGLE TIME. 😡
@outvi fixed typo.
So sorry to hear the news about Kyoto Animation