{"id":409,"date":"2013-03-05T10:57:52","date_gmt":"2013-03-05T02:57:52","guid":{"rendered":"https:\/\/macshuo.com\/?p=409"},"modified":"2013-06-02T11:02:20","modified_gmt":"2013-06-02T03:02:20","slug":"%e9%9a%be%e6%98%93%e7%9b%b8%e6%88%90","status":"publish","type":"post","link":"https:\/\/macshuo.com\/?p=409","title":{"rendered":"\u96be\u6613\u76f8\u6210"},"content":{"rendered":"

\"dificult\"<\/a><\/p>\n

\u53e4\u4eba\u4e91\uff1a\u6709\u65e0\u76f8\u751f\uff0c\u96be\u6613\u76f8\u6210\uff0c\u957f\u77ed\u76f8\u5f62\uff0c\u9ad8\u4e0b\u76f8\u503e\u3002<\/p>\n

\u5f88\u65e9\u5c31\u60f3\u8bf4\u8bf4\u56f0\u96be\u548c\u5bb9\u6613\u8fd9\u70b9\u4e8b\u3002\u4eba\u751f\u4e00\u4e16\uff0c\u6211\u4eec\u5230\u5e95\u662f\u8981\u9009\u62e9\u505a\u5bb9\u6613\u7684\u4e8b\u8fd8\u662f\u505a\u96be\u4e8b\uff1f\u8fd9\u4e2a\u60f3\u6cd5\u6e90\u4e8e\u6625\u8282\u524d\u7684\u4e1a\u52a1\u8ba8\u8bba\u4f1a\uff0c\u6709\u4e24\u4f4d\u7ecf\u7406\u5404\u6267\u4e00\u8bcd\uff0c\u4e00\u4e2a\u8bf4\uff0c\u4e3a\u4e86\u8ba9\u90e8\u95e8\u80fd\u591f\u751f\u5b58\u4e0b\u53bb\uff0c\u6211\u5c3d\u53ef\u80fd\u53bb\u505a\u90a3\u4e9b\u7b80\u5355\u7684\u76f8\u5bf9\u7a33\u5b9a\u7684\u4efb\u52a1\uff0c\u56e0\u4e3a\u8fd9\u6837\u53ef\u4ee5\u4fdd\u8bc1\u826f\u597d\u7684\u73b0\u91d1\u6d41\u3002\u53e6\u4e00\u4e2a\u8bf4\uff0c\u4e3a\u4e86\u80fd\u8ba9\u90e8\u95e8\u751f\u5b58\u4e0b\u53bb\uff0c\u6211\u5c3d\u53ef\u80fd\u53bb\u505a\u90a3\u4e9b\u56f0\u96be\u7684\u5229\u6da6\u66f4\u9ad8\u7684\u4efb\u52a1\uff0c\u56e0\u4e3a\u8fd9\u6837\u53ef\u4ee5\u4fdd\u8bc1\u826f\u597d\u7684\u73b0\u91d1\u6d41\u3002<\/p>\n

\u96be\u6613\u76f8\u6210\uff0c\u56f0\u96be\u548c\u5bb9\u6613\u4f1a\u5728\u4e0d\u540c\u7684\u73af\u5883\u4e0b\u4f1a\u76f8\u4e92\u8f6c\u5316\uff0c\u6211\u89c9\u5f97\u8fd9\u4e24\u4f4d\u7ecf\u7406\u5728\u7279\u5b9a\u573a\u666f\u4e0b\u8bf4\u5f97\u90fd\u6ca1\u9519\u3002<\/p>\n

\u5c31\u4e2a\u4eba\u800c\u8a00\uff0c\u6211\u89c9\u5f97\u6211\u4eec\u5e94\u8be5\u5c3d\u53ef\u80fd\u505a\u90a3\u4e9b\u56f0\u96be\u7684\u4e8b\u60c5\uff0c\u8ba9\u522b\u4eba\u53d8\u5f97\u4e0d\u90a3\u4e48\u56f0\u96be\u3002\u65e0\u8bba\u662f\u505a\u8f6f\u4ef6\u8fd8\u662f\u505a\u4e92\u8054\u7f51\u670d\u52a1\uff0c\u5176\u5b9e\u7ec8\u6781\u610f\u4e49\u5c31\u662f\u4f60\u505a\u51fa\u6765\u7684\u4e1c\u897f\u80fd\u5426\u89e3\u51b3\u7528\u6237\u7684\u95ee\u9898\uff0c\u5982\u679c\u8fd9\u662f\u4e00\u4e2a\u5bb9\u6613\u89e3\u51b3\u7684\u95ee\u9898\uff0c\u90a3\u4e48\u5f88\u591a\u4eba\u65e9\u5df2\u7ecf\u89e3\u51b3\u4e86\uff1b\u5982\u679c\u8fd9\u662f\u4e2a\u56f0\u96be\u7684\u95ee\u9898\uff0c\u90a3\u5c31\u610f\u5473\u7740\u5f88\u591a\u5751\u7b49\u7740\u8981\u57cb\u4f60\u3002\u548b\u9009\u5462\uff0c\u4f3c\u4e4e\u600e\u4e48\u9009\u90fd\u662f\u70ae\u7070\uff0c\u6743\u8861\u4e00\u4e0b\uff0c\u9009\u62e9\u524d\u8005\u57fa\u672c\u662f\u65e0\u7528\u529f\uff0c\u90a3\u6211\u4eec\u53ea\u597d\u9009\u62e9\u540e\u8005\uff0c\u6211\u4eec\u672c\u8eab\u4e5f\u662f\u7231\u6316\u5751\u7684\u4eba\uff0c\u51b5\u4e14\u56f0\u96be\u9762\u524d\u4eba\u4eba\u5e73\u7b49\u4e48\u3002<\/p>\n

JetBrains\u662f\u4e00\u5bb6\u6377\u514b\u7684\u8f6f\u4ef6\u516c\u53f8\uff0c\u4ed6\u4eec\u505a\u7684\u4e8b\u60c5\u5c31\u662f\u4e3aJava\uff0cObjective-C\uff0cPython\uff0cRuby\uff0cJS\u7b49\u8bed\u8a00\u5199\u5f00\u53d1IDE\uff0c\u7ed9\u7a0b\u5e8f\u5458\u5199\u5de5\u5177\u53ef\u4e0d\u662f\u95f9\u7740\u73a9\u7684\uff0c\u4ed6\u4eec\u5bf9IDE\u7684\u6311\u5254\u57fa\u672c\u6bd4\u80a9\u5973\u6027\u5bf9\u5316\u5986\u54c1\uff0c\u4f46JetBrains\u5f00\u53d1\u51fa\u6765\u7684\u5de5\u5177\u6df1\u53d7\u7a0b\u5e8f\u5458\u559c\u7231\uff0c\u5404\u79cd\u667a\u80fd\uff0c\u5404\u79cd\u6548\u7387\uff0c\u4ed6\u4eec\u83b7\u5f97\u4e86\u6781\u5927\u7684\u6210\u529f\uff0c\u4e3a\u5565\uff0c\u56e0\u4e3a\u505a\u7740\u522b\u4eba\u5f88\u96be\u505a\u6210\u7684\u4e8b\u3002<\/p>\n

\u8ba9\u81ea\u5df1\u56f0\u96be\u70b9\uff0c\u8ba9\u522b\u4eba\u5bb9\u6613\u70b9\uff0c\u8bf4\u4e86\u534a\u5929\uff0c\u597d\u50cf\u5c31\u8fd9\u4e48\u70b9\u4e8b\u3002<\/p>\n

\u4eca\u65e5\u63a8\u9001\u7684Mac\u6280\u5de7\uff1a<\/h1>\n

\u5728Mac\u4e0b\u5982\u4f55\u8fdb\u884c\u6587\u4ef6\u6bd4\u8f83\uff1f
\n1\u3001\u5bf9\u4e8e\u5355\u4e2a\u6587\u4ef6\u7684\u6bd4\u8f83\uff0c\u4e00\u822c\u4f7f\u7528diff\u6216vimdiff\u5c31\u53ef\u4ee5\u4e86\uff0c\u6bd4\u5982\uff1a<\/p>\n

vimdiff destfile.txt sourcefile.txt<\/p>\n

vim\u4f1a\u975e\u5e38\u6e05\u6670\u7684\u663e\u51fa\u65f6\u6587\u4ef6\u7684\u4e0d\u540c\uff0c\u8fd8\u6709\u5f88\u591a\u5feb\u6377\u65b9\u5f0f\u5e2e\u52a9\u4f60\u67e5\u770b\u548c\u64cd\u4f5c\u6587\u4ef6\uff0c\u8fd9\u4e2a\u547d\u4ee4\u6bd4\u8f83\u9002\u5408\u547d\u4ee4\u884c\u7231\u597d\u8005\uff0c\u5982\u679c\u5927\u5bb6\u559c\u6b22\uff0c\u540e\u7eed\u53ef\u4ee5\u8bb2\u8bb2\u3002<\/p>\n

2\u3001\u5bf9\u4e8e\u5927\u6279\u91cf\u6587\u4ef6\u7684\u6bd4\u8f83\uff0c\u8fd8\u662f\u56fe\u5f62\u5316\u6bd4\u8f83\u5de5\u5177\u66f4\u5408\u9002\u4e00\u4e9b\u3002OS X\u81ea\u5e26\u4e86FileMerge\u6bd4\u8f83\u5de5\u5177\uff0c\u53ef\u4ee5\u6ee1\u8db3\u90e8\u5206\u9700\u6c42\uff0c\u4f46\u5bf9\u4e8e\u4e2d\u6587\u7f16\u7801\u6587\u4ef6\u6216\u5927\u6587\u4ef6\u7ecf\u5e38\u4f1a\u5d29\u6e83\uff0c\u5f88\u5947\u602aApple\u4e00\u76f4\u4e0d\u89e3\u51b3\u8fd9\u4e2a\u95ee\u9898\u3002<\/p>\n

3\u3001\u63a8\u8350\u4e00\u6b3e\u6536\u8d39\u8f6f\u4ef6\uff0cVisualDiffer\uff0825\u5143\uff09\uff0cUI\u3001\u529f\u80fd\u548c\u7a33\u5b9a\u6027\u90fd\u975e\u5e38\u4e0d\u9519\uff0c\u5b9e\u5728\u662f\u5c45\u5bb6\u65c5\u884c\u3001\u4ee3\u7801\u6bd4\u8f83\u3001\u67e5\u627e\u95ee\u9898\u7684\u5fc5\u5907\u5229\u5668\uff0c\u6709\u9700\u8981\u7684\u7ae5\u9774\u53ef\u4ee5\u611f\u53d7\u4e0b\u3002<\/p>\n

\u9009\u62e9\u56f0\u96be\u7684\u4e8b\u60c5\uff0c\u5728\u751f\u6d3b\u91cc\u4e5f\u6ca1\u4ec0\u4e48\u4e0d\u597d\u3002\u5750\u5728\u6c99\u53d1\u4e0a\u770b\u7535\u89c6\u66f4\u56f0\u96be\u8fd8\u662f\u5728\u7535\u8111\u524d\u9762\u5199\u4e00\u7bc7\u6587\u7ae0\u56f0\u96be\uff0c\u663e\u7136\u662f\u540e\u8005\uff0c\u4f60\u770b\u6211\u5c31\u9009\u62e9\u4e86\u505a\u56f0\u96be\u7684\u4e8b……<\/p>\n","protected":false},"excerpt":{"rendered":"

\u53e4\u4eba\u4e91\uff1a\u6709\u65e0\u76f8\u751f\uff0c\u96be\u6613\u76f8\u6210\uff0c\u957f\u77ed\u76f8\u5f62\uff0c\u9ad8\u4e0b\u76f8\u503e\u3002 \u5f88\u65e9\u5c31\u60f3\u8bf4\u8bf4\u56f0\u96be\u548c\u5bb9\u6613\u8fd9\u70b9\u4e8b\u3002 … Continue reading →<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"spay_email":"","footnotes":""},"categories":[1],"tags":[2,69,70],"class_list":["post-409","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-app","tag-diff","tag-70"],"jetpack_featured_media_url":"","_links":{"self":[{"href":"https:\/\/macshuo.com\/index.php?rest_route=\/wp\/v2\/posts\/409","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/macshuo.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/macshuo.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/macshuo.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/macshuo.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=409"}],"version-history":[{"count":1,"href":"https:\/\/macshuo.com\/index.php?rest_route=\/wp\/v2\/posts\/409\/revisions"}],"predecessor-version":[{"id":411,"href":"https:\/\/macshuo.com\/index.php?rest_route=\/wp\/v2\/posts\/409\/revisions\/411"}],"wp:attachment":[{"href":"https:\/\/macshuo.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=409"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/macshuo.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=409"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/macshuo.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=409"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}