{"id":128170,"date":"2020-06-16T11:54:24","date_gmt":"2020-06-16T03:54:24","guid":{"rendered":"http:\/\/4563.org\/?p=128170"},"modified":"2020-06-16T11:54:24","modified_gmt":"2020-06-16T03:54:24","slug":"%e5%a6%82%e4%bd%95%e6%af%94%e8%be%83%e4%b8%a4%e4%b8%aa%e5%a4%a7%e7%9a%84%e6%96%87%e6%9c%ac%e6%96%87%e4%bb%b6%e5%86%85%e5%ae%b9%e7%9a%84%e5%b7%ae%e5%bc%82","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=128170","title":{"rendered":"\u5982\u4f55\u6bd4\u8f83\u4e24\u4e2a\u5927\u7684\u6587\u672c\u6587\u4ef6\u5185\u5bb9\u7684\u5dee\u5f02"},"content":{"rendered":"
\n
\n
\n

\u5982\u4f55\u6bd4\u8f83\u4e24\u4e2a\u5927\u7684\u6587\u672c\u6587\u4ef6\u5185\u5bb9\u7684\u5dee\u5f02 <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : yeyu1989 <\/span> <\/i> 66<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n

\u5047\u8bbe A\u3001B \u4e24\u4e2a\u6587\u4ef6\uff0c\u6309\u884c\u6bd4\uff0c\u663e\u793a A \u6bd4 B \u591a\u7684\u884c\u3001B \u6bd4 A \u591a\u7684\u884c\u3001A \u4e0e B \u90fd\u5b58\u5728\u4f46\u662f\u4e0d\u4e00\u81f4\u7684\u884c\u3002 \u7c7b\u4f3c\u4e8e\u5b9e\u73b0 Beyond Compare \u7684\u529f\u80fd\u3002<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (12<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : TimePPT <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u65e2\u7136\u662f python \u8282\u70b9\u7684\u8bdd\uff0c\u8bd5\u8bd5 python \u6807\u51c6\u5e93 difflib \uff1f
    https:\/\/docs.python.org\/zh-cn\/3.7\/library\/difflib.html <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Vegetable <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u8fd9\u4e5f\u592a\u7b3c\u7edf\u4e86,\u4f60\u8fd9\u4e2a\u9700\u6c42\u4e5f\u8bb8 git diff \u5c31\u80fd\u6ee1\u8db3,”A \u4e0e B \u90fd\u5b58\u5728\u4f46\u662f\u4e0d\u4e00\u81f4\u7684\u884c”\u662f\u8bf4\u4f4d\u7f6e\u4e0d\u540c\u5417?
    \u7b80\u5355\u6765\u8bf4,\u56e0\u4e3a\u4f60\u7684\u6700\u5c0f\u5bf9\u6bd4\u5355\u4f4d\u662f\u884c,\u6240\u4ee5\u4f60\u53ef\u4ee5\u76f4\u63a5\u8ba1\u7b97\u5355\u884c\u7684 md5,\u4e3a\u4e24\u4e2a\u6587\u4ef6\u5efa\u7acb{hash:line_no}\u7684\u5b57\u5178,\u8fdb\u884c\u540e\u7eed\u5904\u7406. <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : haozxuan001 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    linux \u6709\u4e00\u4e2a comm \u53ef\u4ee5\u4e86\u89e3\u4e00\u4e0b\uff0c\u4e0d\u540c\u7684\u53c2\u6570\u53ef\u4ee5\u5bf9\u6bd4\u51fa\u4e0d\u540c\u7684\u5dee\u5f02\uff0c\u6bd4\u5982 A \u6709 B \u65e0\uff0cA \u65e0 B \u6709\uff0c\u5f53\u7136\u9700\u8981\u6ce8\u610f\u4e00\u53e5\u8fd9\u4e24\u4e2a\u5927\u6587\u4ef6\u9700\u8981\u5148\u6392\u5e8f\u4e00\u4e0b <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : leafin <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u201cA \u4e0e B \u90fd\u5b58\u5728\u4f46\u662f\u4e0d\u4e00\u81f4\u7684\u884c\u201d\u8fd9\u4e00\u53e5\u8bdd\u600e\u4e48\u5b9a\u4e49\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : SoulMelody <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    https:\/\/meldmerge.org\/ <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : yeyu1989 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u8ffd\u52a0\u95ee\u9898\u63cf\u8ff0\uff1a
    \u5927\u6587\u4ef6\u6709\u591a\u5927\uff1a\u53ef\u8fbe G \u7ea7\u522b
    \u6587\u4ef6\u683c\u5f0f\uff1a\u591a\u4e3a\u6bcf\u884c\u5b9a\u957f\u7684 txt \u6587\u4ef6\uff0c\u6309\u5217\u5b9a\u4e49\u4e0d\u540c\u7684\u5b57\u6bb5\u3002\u4e4b\u524d\u6709\u8003\u8651\u8fc7\uff0c\u5148\u5c06 txt \u8f6c\u4e3a csv \u6587\u4ef6\uff0c\u5b9a\u4e49\u4e3b\u952e\uff0c\u518d\u6bd4\u5bf9\uff0c\u4f46\u662f\u8fd9\u6837\u5bf9\u5b58\u50a8\u3001\u5185\u5b58\u6d88\u8017\u90fd\u7279\u522b\u5927\uff0c\u5e76\u4e14\u6709\u7684\u6587\u4ef6\u5b9a\u4e49\u4e3b\u952e\u540e\u5efa\u4e0d\u4e86\u7d22\u5f15\uff0c\u4e5f\u65e0\u6cd5\u5b8c\u6210\u6bd4\u5bf9<\/p>\n

    Beyond Compare \u5728\u5b9a\u4e49 A \u6709 B \u65e0\u3001A \u65e0 B \u6709\u3001AB \u4e0d\u4e00\u81f4\u65f6\uff0c\u8c8c\u4f3c\u662f\u6309\u7167\u76f8\u4f3c\u5ea6\u6765\u5904\u7406\u7684\uff1f\u8fd9\u4e2a\u7b2c\u4e00\u6ca1\u6709\u4e3b\u952e\u8bf4\u660e\uff0c\u786e\u5b9e\u4e0d\u597d\u5b9a\u4e49\u3002<\/p>\n

    \u4ee5\u4e0a\u3002
    @Vegetable @haozxuan001 @leafin
    @TimePPT \u591a\u8c22\uff0c\u6211\u53bb\u5b66\u4e60\u4e0b\uff0c\u770b\u770b\u884c\u4e0d\u884c <\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : gwy15 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u770b\u770b Myers \u7b97\u6cd5 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : haozxuan001 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @yeyu1989 \u6211\u4e4b\u524d\u505a\u8fc7 M \u7ea7\u522b\u7684\uff0c\u4e2a\u4eba\u8ba4\u4e3a\u5982\u679c\u8fbe\u5230 G \u7684\u7ea7\u522b\uff0c\u4e00\u5b9a\u662f\u5148\u6392\u5e8f\u540e\u5bf9\u6bd4\uff0c\u8fd9\u6837\u624d\u80fd\u4e0d\u7206\u5185\u5b58\u7684\u60c5\u51b5\u4e0b\uff0c\u201c\u4e00\u5757\u5757\u201d\u7684\u5bf9\u6bd4\u51fa\u6765\uff0c\u53e6\u5916\u4f60\u7684 AB \u4e0d\u4e00\u81f4\u76f8\u4f3c\u5ea6\u8fd9\u79cd\u5c31\u7384\u5b66\u4e86\uff0c\u4e00\u6837\u5c31\u662f\u4e00\u6837\uff0c\u4e0d\u4e00\u6837\u9519\u4e00\u4e2a\u5b57\u7b26\u90fd\u4e0d\u4e00\u6837\uff0c\u5982\u679c\u8fd9\u662f\u4e00\u4e2a\u5f3a\u9700\u6c42\uff0c\u53ef\u80fd\u6211\u4e0a\u8ff0\u7684\u65b9\u6848\u5c31\u5408\u9002\u4e86\uff0c\u5982\u679c\u662f\u5f31\u9700\u6c42\uff0c\u53ef\u4ee5\u5148\u627e\u51fa\u4e24\u4e2a\u6587\u4ef6\u7684\u5dee\u5f02\u884c\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : richzhu <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    vimdiff fileA fileB <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : 614457662 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5148 sort \u518d diff <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : hxse <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @yeyu1989 \u6807\u51c6\u5e93 difflib \u80fd\u89e3\u51b3\u4f60\u7684\u9700\u6c42\u5417 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : yeyu1989 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @hxse \u8fd8\u6ca1\u6709\u8bd5 \/\/\/\u76f4\u89c9\u4e0d\u884c\uff0c\u6548\u7387\u53ef\u80fd\u8ddf\u4e0d\u4e0a <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    \u5982\u4f55\u6bd4\u8f83\u4e24\u4e2a\u5927\u7684\u6587\u672c\u6587\u4ef6\u5185\u5bb9\u7684\u5dee\u5f02…<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[],"tags":[],"_links":{"self":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/128170"}],"collection":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=128170"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/128170\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=128170"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=128170"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=128170"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}