{"id":37702,"date":"2023-12-25T07:33:58","date_gmt":"2024-03-03T18:26:06","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/"},"modified":"2024-05-04T15:16:36","modified_gmt":"2024-05-04T07:16:36","slug":"git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/","title":{"rendered":"Git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git mergetool\u7684\u65b9\u6cd5\uff09"},"content":{"rendered":"<h2>\u5982\u679c\u6587\u4ef6\u7f16\u8f91\u53d1\u751f\u51b2\u7a81\u7684\u60c5\u51b5<\/h2>\n<p>\u8fd9\u662f\u4e00\u4e2a\u5e38\u89c1\uff08\u4ee4\u4eba\u4e0d\u5feb\uff09\u7684\u51b2\u7a81\u753b\u9762\uff0c\u4e0d\u662f\u5417\uff1f<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d302e37434c4406c5b08a\/2-0.png\" alt=\"\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u3068\u304d\u306egit status\" \/><\/div>\n<p>\u4f60\u4eec\u90fd\u662f\u901a\u8fc7\u4ec0\u4e48\u6837\u7684\u65b9\u5f0f\u6765\u5408\u5e76\u51b2\u7a81\u7684\u5462\uff1f\u6211\u60f3\u5927\u90e8\u5206\u4eba\u90fd\u662f\u76f4\u63a5\u5728vim\u6216\u8005emacs\u4e2d\u8fdb\u884c\u7f16\u8f91\uff0c\u4f46\u5b9e\u9645\u6253\u5f00\u6587\u4ef6\u540e\u4f1a\u663e\u793a\u4ee5\u4e0b\u5dee\u5f02\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"conflict-marker.png\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d302e37434c4406c5b08a\/4-0.png\" alt=\"conflict-marker.png\" \/><\/div>\n<p>\u770b\u5230\u8fd9\u4e2a\u754c\u9762\uff0c\u6211\u4e0d\u77e5\u9053\u5e94\u8be5\u5982\u4f55\u5408\u5e76\u3002\uff08\u5982\u679c\u6709 Objective-C \u7684 ARC\/MRC \u53cc\u91cd\u5f00\u53d1\u7ecf\u9a8c\uff0c\u8bf7\u95ed\u4e0a\u773c\u775b&#8230;.\uff09<\/p>\n<p>Git\u4e2d\u914d\u5907\u4e86\u4e00\u4e2a\u540d\u4e3agit mergetool\u7684\u547d\u4ee4\uff0c\u5b83\u5bf9\u8fd9\u7c7b\u51b2\u7a81\u5408\u5e76\u63d0\u4f9b\u652f\u6301\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d302e37434c4406c5b08a\/7-0.png\" alt=\"git mergetool\u306e\u30d7\u30ed\u30f3\u30d7\u30c8\" \/><\/div>\n<p>\u5982\u679c\u6309\u4e0bEnter\u952e\uff0c\u5c06\u4f1a\u51fa\u73b0\u4e0b\u9762\u8fd9\u6837\u7684\u753b\u9762\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"mergetool2.png\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d302e37434c4406c5b08a\/9-0.png\" alt=\"mergetool2.png\" \/><\/div>\n<p>\u7531\u4e8e\u753b\u9762\u5c3a\u5bf8\u9650\u5236\uff0c\u5b57\u4f53\u8f83\u5c0f\u3002\u73b0\u5728\u6211\u4eec\u6765\u5173\u6ce8\u4e00\u4e0b\u60f3\u8981\u5408\u5e76\u7684\u5dee\u5f02\u4ea7\u751f\u524d\u7684\u72b6\u6001\u548c\u60f3\u8981\u5408\u5e76\u7684\u5dee\u5f02\u90e8\u5206\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"mergetool2-base-remote.png\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d302e37434c4406c5b08a\/11-0.png\" alt=\"mergetool2-base-remote.png\" \/><\/div>\n<p>\u5f53\u6211\u4eec\u5bf9\u6bd4\u8fd9\u4e24\u4e2a\u65f6\uff0c\u6211\u4eec\u53ef\u4ee5\u53d1\u73b0@property\u4e2d\u7684&#8221;*adapter&#8221;\u5df2\u7ecf\u88ab\u6539\u53d8\u4e3a&#8221;*webViewAdapter&#8221;\u3002<br \/>\n\u5b9e\u9645\u4e0a\uff0c\u6211\u4eec\u60f3\u8981\u5408\u5e76\u7684\u5dee\u5f02\u5185\u5bb9\u5c31\u662f\u4e0a\u8ff0\u53d8\u91cf\u540d\u7684\u66f4\u6539\u3002<\/p>\n<p>\u56e0\u6b64\uff0c\u5728\u201c\u4fdd\u5b58\u4e3a\u5408\u5e76\u7ed3\u679c\u7684\u6587\u4ef6\u201d\u4e2d\uff0c\u6211\u4eec\u9700\u8981\u5728\u53d1\u751f\u51b2\u7a81\u7684\u533a\u57df\u7684\u4e0a\u90e8\uff08\u5c4f\u5e55\u4e0a\u7684HEAD\u4e00\u4fa7\uff09\u5c06adapter\u66f4\u6539\u4e3awebViewAdapter\u3002\u8bf7\u4e0d\u8981\u5fd8\u8bb0\u5220\u9664\u4e0b\u90e8\u7684\u51b2\u7a81\u6807\u8bb0\u3002<\/p>\n<p>\u9806\u4fbf\u63d0\u4e00\u4e0b\uff0c\u5982\u679c\u5728git merge\u4e2d\u51fa\u73b0\u51b2\u7a81\u7684\u60c5\u51b5\uff0c\u4e2d\u95f4\u662f\u5206\u652f\u5206\u53c9\u65f6\u7684\u72b6\u6001\uff0c\u5de6\u8fb9\u662f\u5f53\u524d\u5206\u652f\u6dfb\u52a0\u7684\u5dee\u5f02\uff0c\u53f3\u8fb9\u662f\u60f3\u8981\u5408\u5e76\u7684\u5206\u652f\u6dfb\u52a0\u7684\u5dee\u5f02\uff08\u4e09\u8def\u5408\u5e76\uff09\u3002<br \/>\n\u56e0\u6b64\uff0c\u901a\u8fc7\u6bd4\u8f83\u4e2d\u95f4\u548c\u5de6\u8fb9\uff0c\u6211\u4eec\u53ef\u4ee5\u786e\u8ba4\u5f53\u524d\u5206\u652f\u7684\u8fdb\u5c55\u60c5\u51b5\u3002<br \/>\n\u5728\u8fd9\u4e2a\u4f8b\u5b50\u4e2d\uff0c\u6211\u4eec\u53ef\u4ee5\u770b\u5230\u5728ARC\u9002\u914d\u4e2d\uff0cretain\u53d8\u4e3a\u4e86strong\uff0cassign\u53d8\u4e3a\u4e86weak\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d302e37434c4406c5b08a\/15-0.png\" alt=\"merge\u5f8c\u306e\u72b6\u614b\" \/><\/div>\n<p>\u5f53\u5408\u5e76\u5b8c\u6210\u540e\uff0c\u4fdd\u5b58\u5e76\u5173\u95ed\u7f16\u8f91\u5668\u3002\u5408\u5e76\u524d\u7684\u72b6\u6001\u4f1a\u4fdd\u5b58\u4e3a\u76f8\u5e94\u7684\u6587\u4ef6.orig\u3002\u7531\u4e8e\u5df2\u81ea\u52a8\u6dfb\u52a0\u5230git\uff0c\u8bf7\u8fdb\u884c\u63d0\u4ea4\u3002<\/p>\n<p>\u8bf7\u6ce8\u610f\uff0c\u5982\u679c\u8981\u53d6\u6d88\u64cd\u4f5c\uff0c\u8bf7\u4e0d\u8981\u4fdd\u5b58\u4efb\u4f55\u5185\u5bb9\u5e76\u5173\u95ed\u7f16\u8f91\u5668\u3002<\/p>\n<p>\u203b\u987a\u4fbf\u63d0\u4e00\u4e0b\uff0c\u76ee\u524d\u53ea\u652f\u6301vim\u2026\u2026\u4f46\u662f\u636e\u8bf4emacs\u4e5f\u6709\u4e00\u4e9b\u914d\u7f6e\u65b9\u6cd5\uff0c\u5982\u679c\u6709\u4eba\u80fd\u6210\u529f\u7684\u8bdd\uff0c\u8bf7\u7559\u4e0b\u8bc4\u8bba\u3002<\/p>\n<h3>\u5982\u679c\u542f\u52a8\u7c7b\u4f3c\u4e8e\uff08\u7528\u4e8eXcode\u7684\uff09GUI\u5dee\u5f02\u5de5\u5177\u7684\u60c5\u51b5<\/h3>\n<p>\u56e0\u4e3a\u597d\u50cf\u6709\u4e00\u4e9b\u4eba\u6b63\u5728\u4f7f\u7528opendiff\uff0c\u6240\u4ee5\u8bf7\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5207\u6362\u81f3vimdiff\u3002<\/p>\n<pre class=\"post-pre\"><code>git config <span class=\"nt\">--global<\/span> merge.tool vimdiff\r\n<\/code><\/pre>\n<h2>\u4ee5\u7c7b\u4f3c\u7684\u65b9\u6cd5\uff0c\u5728\u4e0d\u4f7f\u7528mergetool\u7684\u60c5\u51b5\u4e0b\u6267\u884c\u5408\u5e76\uff08\u756a\u5916\u7bc7\uff09\u3002<\/h2>\n<p>\u5bf9\u4e8e\u51fa\u4e8e\u5b97\u6559\u539f\u56e0\u65e0\u6cd5\u4f7f\u7528vim\u6216\u5c4f\u5e55\u8f83\u5c0f\u7684\u4eba\u6765\u8bf4\uff0c\u8fd9\u662f\u4e00\u4e2a\u597d\u6d88\u606f\u3002<\/p>\n<p>\u901a\u5e38\u7684\u51b2\u7a81\u6807\u8bb0\u5de5\u5177\u4e2d\uff0c\u5408\u5e76\u5de5\u5177\u7684\u4e2d\u95f4\u753b\u9762\uff08\u5373\u5c06\u521b\u5efa\u7684\u5408\u5e76\u5dee\u5f02\u4e4b\u524d\u7684\u72b6\u6001\uff0c\u79f0\u4e3a&#8221;BASE&#8221;\uff09\u4f1a\u88ab\u7701\u7565\uff0c\u4f46\u662f\u51b2\u7a81\u6807\u8bb0\u5de5\u5177\u4e2d\u6709\u663e\u793a\u8be5\u9009\u9879\u3002<\/p>\n<pre class=\"post-pre\"><code>git config <span class=\"nt\">--global<\/span> merge.conflictstyle diff3\r\n<\/code><\/pre>\n<p>\u51b2\u7a81\u6807\u8bb0\u5c06\u5982\u4e0b\u6240\u793a\u3002<\/p>\n<pre class=\"post-pre\"><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\r\nmerge\u524d\u306e\u72b6\u614b\r\n||||||| merged common ancestors\r\nmerge\u3057\u305f\u3044\u5dee\u5206\u304c\u4f5c\u3089\u308c\u308b\u76f4\u524d\u306e\u72b6\u614b\r\n=======\r\nmerge\u3057\u305f\u3044\u5dee\u5206\r\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; branch\r\n<\/code><\/pre>\n<p>\u6682\u65f6\u8bbe\u7f6e\u4e5f\u4e0d\u4f1a\u6709\u635f\u5931\u3002\u5373\u4f7f\u5728\u4f7f\u7528mergetool\u7684\u60c5\u51b5\u4e0b\uff0c\u4e5f\u53ef\u4ee5\u5728\u6ca1\u6709\u91cd\u5927\u51b2\u7a81\u7684\u65f6\u5019\u6d3e\u4e0a\u7528\u573a\u3002<br \/>\n\u203b\u4f46\u662f\uff0c\u8bf7\u6ce8\u610f\uff0c\u5728\u6ca1\u6709\u51b2\u7a81\u7684\u4f4d\u7f6e\u6dfb\u52a0\u7684\u66f4\u6539\u662f\u65e0\u6cd5\u7406\u89e3\u7684\uff0c\u6240\u4ee5\u5728\u5904\u7406\u5927\u7684\u5dee\u5f02\u65f6\uff0c\u6700\u597d\u540c\u65f6\u4f7f\u7528mergetool\u548cgit diff\u3002<\/p>\n<p>\u8bf7\u53c2\u8003\uff1ahttp:\/\/qiita.com\/hchbaw\/items\/1191c2627307a4673b1b<\/p>\n<h2>\u5982\u679c\u6587\u4ef6\u5220\u9664\u53d1\u751f\u51b2\u7a81\uff08\u8def\u5f84\u51b2\u7a81\uff09<\/h2>\n<p>\u5f53\u5220\u9664\u7684\u6587\u4ef6\u88ab\u7f16\u8f91\u65f6\uff0c\u4f1a\u53d1\u751f\u8fd9\u79cd\u60c5\u51b5\u3002<\/p>\n<ul class=\"post-ul\">\n<li style=\"list-style-type: none;\">\n<ul class=\"post-ul\">Deleted by them:<\/ul>\n<\/li>\n<\/ul>\n<p>merge\u3059\u308b\u5dee\u5206\u3067\u524a\u9664\u3055\u308c\u3066\u3044\u307e\u3059<br \/>\n\u73fe\u5728\u306ebranch\u3067\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059<\/p>\n<p>Deleted by us:<\/p>\n<p>\u73fe\u5728\u306ebranch\u3067\u524a\u9664\u3055\u308c\u3066\u3044\u307e\u3059<br \/>\nmerge\u3059\u308b\u5dee\u5206\u3067\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059<\/p>\n<p>\u901a\u5e38\u60c5\u51b5\u4e0b\u6211\u4eec\u4f1a\u6700\u7ec8\u9009\u62e9\u5220\u9664\u6587\u4ef6\uff0c\u4f46\u7531\u4e8e\u9700\u8981\u5408\u5e76\uff0c\u6240\u4ee5\u5c06\u4fdd\u7559\u4e0b\u8ff0\u6587\u4ef6\u3002<\/p>\n<pre class=\"post-pre\"><code>git <span class=\"nb\">rm <\/span>path\/to\/target\/file\r\n<\/code><\/pre>\n<p>\u203b\u53ef\u80fd\u4f1a\u51fa\u73b0\u672a\u5408\u5e76\u7684\u6d88\u606f\uff0c\u4f46\u5220\u9664\u5c06\u4f1a\u6b63\u5e38\u53cd\u6620\u3002<\/p>\n<h2>\u5982\u679c\u8981\u591a\u6b21\u5408\u5e76\u76f8\u540c\u7684\u5dee\u5f02\u3002<\/h2>\n<p>git\u6709\u4e00\u4e2a\u540d\u4e3arerere\u7684\u529f\u80fd\uff0c\u5b83\u53ef\u4ee5\u4fdd\u5b58\u5e76\u91cd\u590d\u4f7f\u7528\u51b2\u7a81\u5408\u5e76\u7684\u5dee\u5f02\u7ed3\u679c\u3002<br \/>\n\u5bf9\u4e8e\u7ef4\u62a4\u8005\u548c\u53d1\u5e03\u8d1f\u8d23\u4eba\u6765\u8bf4\uff0c\u5728\u591a\u6b21\u5408\u5e76\u76f8\u540c\u5dee\u5f02\u65f6\u975e\u5e38\u65b9\u4fbf\u3002<br \/>\n\u60a8\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u542f\u7528\u8be5\u529f\u80fd\u3002<\/p>\n<pre class=\"post-pre\"><code>git config <span class=\"nt\">--global<\/span> rerere.enabled <span class=\"nb\">true<\/span>\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u5982\u679c\u6587\u4ef6\u7f16\u8f91\u53d1\u751f\u51b2\u7a81\u7684\u60c5\u51b5 \u8fd9\u662f\u4e00\u4e2a\u5e38\u89c1\uff08\u4ee4\u4eba\u4e0d\u5feb\uff09\u7684\u51b2\u7a81\u753b\u9762\uff0c\u4e0d\u662f\u5417\uff1f \u4f60\u4eec\u90fd\u662f\u901a\u8fc7\u4ec0\u4e48\u6837\u7684\u65b9\u5f0f\u6765\u5408\u5e76\u51b2\u7a81\u7684 [&hellip;]<\/p>\n","protected":false},"author":4,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37702","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>Git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git mergetool\u7684\u65b9\u6cd5\uff09 - 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\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git-mergetool\u7684\u65b9\u6cd5\uff09\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git mergetool\u7684\u65b9\u6cd5\uff09\" \/>\n<meta property=\"og:description\" content=\"\u5982\u679c\u6587\u4ef6\u7f16\u8f91\u53d1\u751f\u51b2\u7a81\u7684\u60c5\u51b5 \u8fd9\u662f\u4e00\u4e2a\u5e38\u89c1\uff08\u4ee4\u4eba\u4e0d\u5feb\uff09\u7684\u51b2\u7a81\u753b\u9762\uff0c\u4e0d\u662f\u5417\uff1f \u4f60\u4eec\u90fd\u662f\u901a\u8fc7\u4ec0\u4e48\u6837\u7684\u65b9\u5f0f\u6765\u5408\u5e76\u51b2\u7a81\u7684 [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git-mergetool\u7684\u65b9\u6cd5\uff09\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2024-03-03T18:26:06+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-04T07:16:36+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d302e37434c4406c5b08a\/2-0.png\" \/>\n<meta name=\"author\" content=\"\u79d1, \u96c5\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u79d1, \u96c5\" \/>\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%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/\",\"name\":\"Git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git mergetool\u7684\u65b9\u6cd5\uff09 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2024-03-03T18:26:06+00:00\",\"dateModified\":\"2024-05-04T07:16:36+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/41e222757cdd2a3365361328bd79970a\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git mergetool\u7684\u65b9\u6cd5\uff09\"}]},{\"@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\/41e222757cdd2a3365361328bd79970a\",\"name\":\"\u79d1, \u96c5\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g\",\"caption\":\"\u79d1, \u96c5\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/keya\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git mergetool\u7684\u65b9\u6cd5\uff09 - 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\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git-mergetool\u7684\u65b9\u6cd5\uff09\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git mergetool\u7684\u65b9\u6cd5\uff09","og_description":"\u5982\u679c\u6587\u4ef6\u7f16\u8f91\u53d1\u751f\u51b2\u7a81\u7684\u60c5\u51b5 \u8fd9\u662f\u4e00\u4e2a\u5e38\u89c1\uff08\u4ee4\u4eba\u4e0d\u5feb\uff09\u7684\u51b2\u7a81\u753b\u9762\uff0c\u4e0d\u662f\u5417\uff1f \u4f60\u4eec\u90fd\u662f\u901a\u8fc7\u4ec0\u4e48\u6837\u7684\u65b9\u5f0f\u6765\u5408\u5e76\u51b2\u7a81\u7684 [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git-mergetool\u7684\u65b9\u6cd5\uff09\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2024-03-03T18:26:06+00:00","article_modified_time":"2024-05-04T07:16:36+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d302e37434c4406c5b08a\/2-0.png"}],"author":"\u79d1, \u96c5","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u79d1, \u96c5","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/","name":"Git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git mergetool\u7684\u65b9\u6cd5\uff09 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2024-03-03T18:26:06+00:00","dateModified":"2024-05-04T07:16:36+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/41e222757cdd2a3365361328bd79970a"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u51b2\u7a81\u89e3\u51b3\u6307\u5357\uff08\u4f7f\u7528git mergetool\u7684\u65b9\u6cd5\uff09"}]},{"@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\/41e222757cdd2a3365361328bd79970a","name":"\u79d1, \u96c5","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g","caption":"\u79d1, \u96c5"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/keya\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e5%86%b2%e7%aa%81%e8%a7%a3%e5%86%b3%e6%8c%87%e5%8d%97%ef%bc%88%e4%bd%bf%e7%94%a8git-mergetool%e7%9a%84%e6%96%b9%e6%b3%95%ef%bc%89\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37702","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\/4"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37702"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37702\/revisions"}],"predecessor-version":[{"id":99089,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37702\/revisions\/99089"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37702"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37702"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37702"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}