{"id":37392,"date":"2024-01-19T12:01:30","date_gmt":"2023-04-10T00:55:22","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/"},"modified":"2024-05-04T19:05:58","modified_gmt":"2024-05-04T11:05:58","slug":"git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/","title":{"rendered":"[Git] \u4f7f\u7528vimdiff\u5728Git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4"},"content":{"rendered":"

\u76ee\u6807<\/h1>\n

\u5f53\u53d1\u751f\u51b2\u7a81\u65f6\uff0c\u4f8b\u5982\u5728pull\u64cd\u4f5c\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528vimdiff\u6765\u89e3\u51b3\u51b2\u7a81\u3002<\/p>\n

\u6b65\u9aa4<\/h1>\n

1. \u7528\u9014<\/h4>\n

\u5f53git pull\u5931\u8d25\u5e76\u4e14\u9700\u8981\u624b\u52a8\u5408\u5e76\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u65b9\u6cd5\u3002<\/p>\n

$ git pull\r\n\uff5e\r\nAuto-merging aaa\r\nCONFLICT (content): Merge conflict in aaa\r\nAutomatic merge failed; fix conflicts and then commit the result.\r\n<\/code><\/pre>\n
2. \u8bbe\u5b9avimdiff\u4f5c\u4e3a\u5408\u5e76\u5de5\u5177\u8fdb\u884c\u4f7f\u7528\u3002<\/h4>\n
\u8bf7\u5c06\u4ee5\u4e0b\u5185\u5bb9\u653e\u5728\u5168\u5c40\u914d\u7f6e\u4e2d\u3002<\/p>\n
$ git config --global merge.tool vimdiff\r\n$ git config --global merge.conflictstyle diff3\r\n$ git config --global mergetool.prompt false\r\n<\/code><\/pre>\n
\u53ea\u8981\u5728git mergetool\u4e2d\u8bbe\u5b9avimdiff\u4f5c\u4e3a\u5408\u5e76\u5de5\u5177\uff0c\u5373\u4f7f\u6ca1\u6709\u8f93\u5165\u4efb\u4f55\u5185\u5bb9\uff0c\u7cfb\u7edf\u4e5f\u4f1a\u8be2\u95ee\u8981\u4f7f\u7528\u54ea\u4e2a\u5408\u5e76\u5de5\u5177\u3002<\/p>\n
\u6253\u5f00vimdiff\u3002<\/h4>\n
$ git mergetool\r\n<\/code><\/pre>\n
\u8f93\u5165\u6b64\u547d\u4ee4\u5c06\u6253\u5f00\u4ee5\u4e0b\u5f62\u5f0f\u7684vimdiff\u754c\u9762\u3002<\/p>\n
\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2566\u2550\u2550\u2550\u2550\u2550\u2550\u2566\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557\r\n\u2551 LOCAL \u2551 BASE \u2551 REMOTE \u2551\r\n\u2560\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2569\u2550\u2550\u2550\u2550\u2550\u2550\u2569\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2563\r\n\u2551                       \u2551\r\n\u2551        MERGED         \u2551\r\n\u2551                       \u2551\r\n\u255a\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255d\r\n<\/code><\/pre>\n
\n
\u30a6\u30a3\u30f3\u30c9\u30a6\u5f79\u5272LOCAL\u73fe\u5728\u306e\u30ef\u30fc\u30ad\u30f3\u30b0\u30c4\u30ea\u30fc\u4e0a\u306e\u30d5\u30a1\u30a4\u30ebBASE\u5171\u901a\u306e\u5148\u7956\u30d5\u30a1\u30a4\u30eb\u3002\u5909\u66f4\u524d\u306f\u3069\u306e\u3088\u3046\u306a\u30d5\u30a1\u30a4\u30eb\u3060\u3063\u305f\u304bREMOTE\u30ef\u30fc\u30ad\u30f3\u30b0\u30c4\u30ea\u30fc\u3078\u30de\u30fc\u30b8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30ebMERGED\u6700\u7d42\u7684\u306b\u30ec\u30dd\u30b8\u30c8\u30ea\u306e\u4e2d\u3067\u4fdd\u5b58\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb<\/div>\n<\/div>\n
4. \u5982\u4f55\u4f7f\u7528vimdiff<\/h4>\n
\u7a97\u53e3\u4e4b\u95f4\u7684\u79fb\u52a8<\/h5>\n
\u53ef\u4ee5\u4f7f\u7528\u952e\u76d8\u4e0a\u7684 [ctrl]+w \u2192 hjkl \u6765\u5728\u5404\u4e2a\u7a97\u53e3\u4e4b\u95f4\u8fdb\u884c\u79fb\u52a8\uff08h\u4ee3\u8868\u5411\u5de6\uff0cj\u4ee3\u8868\u5411\u4e0b\uff0ck\u4ee3\u8868\u5411\u4e0a\uff0cl\u4ee3\u8868\u5411\u53f3\uff09\u3002
\n\u6ce8\u610f\uff1a\u4e5f\u53ef\u4ee5\u4f7f\u7528\u5149\u6807\u952e\u6765\u4ee3\u66ffhjkl\u3002<\/p>\n
\u5408\u5e76\u65b9\u5f0f<\/h5>\n
\u5f53\u5207\u6362\u5230\u5408\u5e76\u7684\u7a97\u53e3\u65f6\uff0c\u51b2\u7a81\u90e8\u5206\u4ee5\u4e0d\u540c\u989c\u8272\u663e\u793a\u3002<\/p>\n
\u51b2\u7a81\u70b9\u662f\u4ece<<<<<<<\u5230>>>>>>>\u4e4b\u95f4\u3002<\/p>\n
<<<<<<< HEAD\r\nlocalfile\r\n||||||| merged common ancestors\r\nancestor\r\n=======\r\nremotefile\r\n>>>>>>> ap8990as3eipsaldjff669197e1sdkfasasdf1131d\r\n<\/code><\/pre>\n
\u5f53\u5c06\u5149\u6807\u7f6e\u4e8e\u51b2\u7a81\u90e8\u5206\u65f6\uff0c\u51b3\u5b9a\u91c7\u7528LOCAL\uff0cBASE\uff0c\u8fd8\u662fREMOTE\uff0c\u5e76\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u8fdb\u884c\u5e94\u7528\u3002<\/p>\n
\n
\u63a1\u7528\u5bfe\u8c61\u53cd\u6620\u30b3\u30de\u30f3\u30c9LOCAL:diffg LBASE:diffg BREMOTE:diffg R\u305d\u306e\u4ed6\u624b\u52d5\u3067\u7de8\u96c6<\/div>\n<\/div>\n
\u5408\u5e76\u5904\u7406\u7ed3\u675f<\/h5>\n
\u7f16\u8f91\u5b8c\u6bd5\u540e\u5173\u95ed\u7a97\u53e3\u3002
\n\u5f53\u5149\u6807\u4f4d\u4e8eMERGED\u7a97\u53e3\u65f6\uff0c\u53ef\u4f7f\u7528:xa\u547d\u4ee4\u4fdd\u5b58\u5e76\u6279\u91cf\u5173\u95ed\u6240\u6709\u7a97\u53e3\u3002
\n\u5982\u679c\u5149\u6807\u4f4d\u4e8eMERGED\u7a97\u53e3\uff0c\u5219\u4f7f\u7528:w\u547d\u4ee4\u4fdd\u5b58\uff0c\u5e76\u4f7f\u7528:qa\u547d\u4ee4\u6279\u91cf\u5173\u95ed\u6240\u6709\u7a97\u53e3\u3002
\n\uff08\u867d\u7136\u4f7f\u7528:wqa\u547d\u4ee4\u53ef\u4ee5\u4e00\u6b21\u6027\u5173\u95ed\u6240\u6709\u7a97\u53e3\uff0c\u4f46\u8fd9\u6837\u4f1a\u5bfc\u81f4LOCAL\u3001BASE\u548cREMOTE\u6587\u4ef6\u5168\u90e8\u4fdd\u5b58\uff0c\u4f7f\u7248\u672c\u5e93\u4e2d\u51fa\u73b0\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6\uff09<\/p>\n
:xa\r\n<\/code><\/pre>\n
\u5220\u9664\u5728\u4f5c\u4e1a\u4e2d\u672a\u88ab\u8ddf\u8e2a\u7684\u6587\u4ef6\u3002<\/h5>\n
vimdiff\u4e2d\u7684\u5408\u5e76\u5904\u7406\u5b8c\u6210\u540e\uff0c\u53d1\u751f\u51b2\u7a81\u7684\u672c\u5730\u6587\u4ef6\u4f1a\u4ee5.orig\u4f5c\u4e3a\u6269\u5c55\u540d\u53e6\u5b58\u4e3a\u522b\u540d\u3002
\n\u8fd9\u4e9b\u7531vimdiff\u4fdd\u5b58\u7684\u5907\u4efd\u6587\u4ef6\u4e0d\u9700\u8981\u5305\u542b\u5728\u7248\u672c\u5e93\u4e2d\uff0c\u56e0\u6b64\u53ef\u4ee5\u4f7f\u7528git clean\u6765\u5220\u9664\u3002
\n\u203b\u9700\u8981\u6ce8\u610f\u4e0d\u8981\u610f\u5916\u5220\u9664\u65b0\u521b\u5efa\u7684\u6587\u4ef6\u3002<\/p>\n
$ git clean -n\r\n$ git clean -f\r\n<\/code><\/pre>\n
\u4f7f\u7528 git clean \u547d\u4ee4\u53ef\u4ee5\u5220\u9664\u6682\u5b58\u533a\u4e2d\u672a\u88ab\u8ddf\u8e2a\u7684\u6587\u4ef6\u3002\u9009\u9879 -n \u662f\u8868\u793a\u8fdb\u884c\u6f14\u4e60\u8fd0\u884c\u7684\u9009\u9879\u3002\u5982\u679c\u53ea\u60f3\u5220\u9664\u7279\u5b9a\u7684\u6587\u4ef6\uff0c\u8bf7\u6307\u5b9a\u6587\u4ef6\u8def\u5f84\u3002<\/p>\n
$ git clean -n %untracked_file_path%\r\n$ git clean -f %untracked_file_path%\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"
\u76ee\u6807 \u5f53\u53d1\u751f\u51b2\u7a81\u65f6\uff0c\u4f8b\u5982\u5728pull\u64cd\u4f5c\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528vimdiff\u6765\u89e3\u51b3\u51b2\u7a81\u3002 \u6b65\u9aa4 1. \u7528\u9014 \u5f53git pu […]<\/p>\n","protected":false},"author":12,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37392","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n[Git] \u4f7f\u7528vimdiff\u5728Git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4 - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/git-\u4f7f\u7528vimdiff\u5728git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"[Git] \u4f7f\u7528vimdiff\u5728Git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4\" \/>\n<meta property=\"og:description\" content=\"\u76ee\u6807 \u5f53\u53d1\u751f\u51b2\u7a81\u65f6\uff0c\u4f8b\u5982\u5728pull\u64cd\u4f5c\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528vimdiff\u6765\u89e3\u51b3\u51b2\u7a81\u3002 \u6b65\u9aa4 1. \u7528\u9014 \u5f53git pu […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git-\u4f7f\u7528vimdiff\u5728git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-04-10T00:55:22+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-04T11:05:58+00:00\" \/>\n<meta name=\"author\" content=\"\u9038, \u79d1\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u9038, \u79d1\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"1 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/\",\"name\":\"[Git] \u4f7f\u7528vimdiff\u5728Git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-04-10T00:55:22+00:00\",\"dateModified\":\"2024-05-04T11:05:58+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"[Git] \u4f7f\u7528vimdiff\u5728Git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487\",\"name\":\"\u9038, \u79d1\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g\",\"caption\":\"\u9038, \u79d1\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/keyi\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"[Git] \u4f7f\u7528vimdiff\u5728Git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4 - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/git-\u4f7f\u7528vimdiff\u5728git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4\/","og_locale":"zh_CN","og_type":"article","og_title":"[Git] \u4f7f\u7528vimdiff\u5728Git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4","og_description":"\u76ee\u6807 \u5f53\u53d1\u751f\u51b2\u7a81\u65f6\uff0c\u4f8b\u5982\u5728pull\u64cd\u4f5c\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528vimdiff\u6765\u89e3\u51b3\u51b2\u7a81\u3002 \u6b65\u9aa4 1. \u7528\u9014 \u5f53git pu […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git-\u4f7f\u7528vimdiff\u5728git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-04-10T00:55:22+00:00","article_modified_time":"2024-05-04T11:05:58+00:00","author":"\u9038, \u79d1","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u9038, \u79d1","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/","name":"[Git] \u4f7f\u7528vimdiff\u5728Git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-04-10T00:55:22+00:00","dateModified":"2024-05-04T11:05:58+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"[Git] \u4f7f\u7528vimdiff\u5728Git\u5408\u5e76\u4e2d\u5b9e\u73b0\u5dee\u5f02\u5bf9\u6bd4"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/85c1dae56e6ea1e695c73d33c684d487","name":"\u9038, \u79d1","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/c94f6d9cbbfbca863fab309840bd690c153c95f8490c290ad2ed54dd693dad16?s=96&d=mm&r=g","caption":"\u9038, \u79d1"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/keyi\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git-%e4%bd%bf%e7%94%a8vimdiff%e5%9c%a8git%e5%90%88%e5%b9%b6%e4%b8%ad%e5%ae%9e%e7%8e%b0%e5%b7%ae%e5%bc%82%e5%af%b9%e6%af%94\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37392","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/12"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37392"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37392\/revisions"}],"predecessor-version":[{"id":100141,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37392\/revisions\/100141"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37392"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37392"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37392"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}