{"id":792,"date":"2026-06-25T13:59:59","date_gmt":"2026-06-25T13:59:59","guid":{"rendered":"https:\/\/hyc.eshachem.com\/program\/?page_id=792"},"modified":"2026-06-30T02:54:47","modified_gmt":"2026-06-30T02:54:47","slug":"6-conflict-%e8%a1%9d%e7%aa%81","status":"publish","type":"page","link":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/","title":{"rendered":"7. Conflict \u885d\u7a81"},"content":{"rendered":"\n<p class=\"wp-block-paragraph\">\u5728\u524d\u9762\u5e7e\u7ae0\uff0c\u6211\u5011\u5b78\u6703\u4e86\u958b\u95e2\u5e73\u884c\u5b87\u5b99\uff08\u5206\u652f\uff09\u4ee5\u53ca\u5408\u4f75\uff08Merge\uff09\u3002Git \u901a\u5e38\u5f88\u8070\u660e\uff0c\u53ea\u8981\u5169\u500b\u4eba\u6539\u7684\u662f\u4e0d\u540c\u7684\u6a94\u6848\u3001\u6216\u662f\u540c\u500b\u6a94\u6848\u7684\u4e0d\u540c\u884c\uff0cGit \u90fd\u6703\u9ed8\u9ed8\u5730\u5e6b\u4f60\u81ea\u52d5\u5408\u9ad4\uff08Fast-forward \u6216\u81ea\u52d5\u5408\u4f75\uff09\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4f46\u662f\uff0c\u5929\u6709\u4e0d\u6e2c\u98a8\u96f2\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u7576\u4e3b\u7dda\u5b87\u5b99\uff08<code>main<\/code>\uff09<strong>\u6709\u4eba\u6539\u4e86 <code>index.html<\/code> \u7684\u7b2c 3 \u884c\uff0c\u800c\u4f60\u7684<\/strong>\u5e73\u884c\u5b87\u5b99\uff08<code>feature<\/code>\uff09\u4e5f\u6539\u4e86 <code>index.html<\/code> \u7684\u7b2c 3 \u884c\u3002\u7576\u4f60\u5feb\u6a02\u5730\u8f38\u5165 <code>git merge<\/code> \u6642\u2026\u2026<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u6b64\u6642 <strong>Git<\/strong> \u6703\u4e0d\u77e5\u9053\u5230\u5e95\u300c\u8ab0\u6539\u7684\u624d\u662f\u5c0d\u7684\u300d\uff0c\u65bc\u662f\u5b83\u6703\u96d9\u624b\u4e00\u6524\uff0c\u628a\u6a94\u6848\u4e1f\u56de\u7d66\u4f60\uff0c\u53eb\u4f60\u81ea\u5df1\u8655\u7406\u597d\uff1a<\/p>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p class=\"wp-block-paragraph\"><code>CONFLICT (content): Merge conflict in index.html<\/code><\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><code>Automatic merge failed; fix conflicts and then commit the result.<\/code><\/p>\n<\/blockquote>\n\n\n\n<p class=\"wp-block-paragraph\">\u9019\u5c31\u662f\u50b3\u8aaa\u4e2d\u7684<strong>\u885d\u7a81<\/strong>\u3002Git \u9078\u64c7\u4e0d\u64c5\u81ea\u4f5c\u4e3b\uff0c\u800c\u662f\u628a\u6c7a\u5b9a\u6b0a\u4ea4\u9084\u7d66\u4f60\u3002<\/p>\n\n\n\n<div class=\"wp-block-merpress-mermaidjs diagram-source-mermaid\"><pre class=\"mermaid\">gitGraph\n    commit id: \"\u5efa\u7acb\u5c08\u6848 (Line 3: \u539f\u59cb\u6587\u5b57)\"\n    \n    branch feature\/conflict-test\n    \n    checkout main\n    commit id: \"main \u4fee\u6539 Line 3 (\u4e3b\u7dda\u6587\u5b57)\"\n    \n    checkout feature\/conflict-test\n    commit id: \"feature \u4fee\u6539 Line 3 (\u5e73\u884c\u5b87\u5b99\u6587\u5b57)\"\n    \n    checkout main\n    merge feature\/conflict-test id: \"\ud83d\udca5 Conflict! \u5169\u908a\u90fd\u6539\u4e86 Line 3\"<\/pre><\/div>\n\n\n\n<h2 class=\"wp-block-heading\" id=\"1-%e6%a8%a1%e6%93%ac%e8%a1%9d%e7%aa%81\">1. \u6a21\u64ec\u885d\u7a81<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u70ba\u4e86\u5b78\u6703\u89e3\u885d\u7a81\uff0c\u6700\u597d\u7684\u65b9\u5f0f\u5c31\u662f\u81ea\u5df1\u641e\u51fa\u4e00\u5834\u885d\u7a81\u3002\u6211\u5011\u4f86\u5be6\u4f5c\u4e00\u6b21\uff1a<\/p>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"%e6%ad%a5%e9%a9%9f-1\">\u6b65\u9a5f 1<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u5728 <code>main<\/code> \u5206\u652f\u6539\u52d5\u7b2c 3 \u884c\u3002\u78ba\u4fdd\u4f60\u5728 <code>main<\/code> \u5206\u652f\uff0c\u628a <code>index.html<\/code> \u7684\u7b2c 3 \u884c\u6539\u6210\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\" aria-describedby=\"shcb-language-1\" data-shcb-language-name=\"HTML, XML\" data-shcb-language-slug=\"xml\"><span><code class=\"hljs language-xml\"><span class=\"hljs-tag\">&lt;<span class=\"hljs-name\">p<\/span>&gt;<\/span>\u9019\u662f\u4e3b\u7dda\u5b87\u5b99\u6539\u5beb\u7684\u6587\u5b57<span class=\"hljs-tag\">&lt;\/<span class=\"hljs-name\">p<\/span>&gt;<\/span>\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-1\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">HTML, XML<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">xml<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre>\n\n\n<p class=\"wp-block-paragraph\">\u7136\u5f8c\u6253\u5305\u63d0\u4ea4\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\" aria-describedby=\"shcb-language-2\" data-shcb-language-name=\"JavaScript\" data-shcb-language-slug=\"javascript\"><span><code class=\"hljs language-javascript\">git add .\ngit commit -m <span class=\"hljs-string\">\"style: update line 3 in main\"<\/span>\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-2\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">JavaScript<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">javascript<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre>\n\n\n<h3 class=\"wp-block-heading\" id=\"%e6%ad%a5%e9%a9%9f-2\">\u6b65\u9a5f 2<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u53bb\u65b0\u5206\u652f\u6539\u52d5\u300c\u540c\u4e00\u884c\u300d\u3002\u6211\u5011\u5f9e\u9019\u500b\u6642\u9593\u9ede\u958b\u4e00\u500b\u65b0\u5206\u652f\uff0c\u6545\u610f\u4e5f\u53bb\u6539\u7b2c 3 \u884c\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><span><code class=\"hljs\">git checkout -b feature\/conflict-test\n<\/code><\/span><\/pre>\n\n\n<p class=\"wp-block-paragraph\">\u6253\u958b <code>index.html<\/code>\uff0c\u628a\u7b2c 3 \u884c\u6539\u6210\u5b8c\u5168\u4e0d\u540c\u7684\u6771\u897f\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\" aria-describedby=\"shcb-language-3\" data-shcb-language-name=\"HTML, XML\" data-shcb-language-slug=\"xml\"><span><code class=\"hljs language-xml\"><span class=\"hljs-tag\">&lt;<span class=\"hljs-name\">p<\/span>&gt;<\/span>\u9019\u662f\u5e73\u884c\u5b87\u5b99\u5b8c\u5168\u4e0d\u4e00\u6a23\u7684\u6587\u5b57\uff01\uff01\uff01<span class=\"hljs-tag\">&lt;\/<span class=\"hljs-name\">p<\/span>&gt;<\/span>\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-3\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">HTML, XML<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">xml<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre>\n\n\n<p class=\"wp-block-paragraph\">\u4e00\u6a23\u6253\u5305\u63d0\u4ea4\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\" aria-describedby=\"shcb-language-4\" data-shcb-language-name=\"JavaScript\" data-shcb-language-slug=\"javascript\"><span><code class=\"hljs language-javascript\">git add .\ngit commit -m <span class=\"hljs-string\">\"style: update line 3 in branch\"<\/span>\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-4\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">JavaScript<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">javascript<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre>\n\n\n<h3 class=\"wp-block-heading\" id=\"%e6%ad%a5%e9%a9%9f-3%ef%bc%9a\">\u6b65\u9a5f 3\uff1a<\/h3>\n\n\n\n<p class=\"wp-block-paragraph\">\u885d\u7a81\uff01\u73fe\u5728\uff0c\u5207\u63db\u56de <code>main<\/code> \u5206\u652f\uff0c\u6e96\u5099\u5f37\u884c\u628a\u65b0\u5206\u652f\u5408\u9032\u4f86\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><span><code class=\"hljs\">git checkout main\ngit merge feature\/conflict-test\n<\/code><\/span><\/pre>\n\n\n<p class=\"wp-block-paragraph\">\u6b64\u6642\u7d42\u7aef\u6a5f\u6703\u8df3\u51fa\u932f\u8aa4\u8a0a\u606f\uff0c\u800c\u4e14\u4f60\u7684\u5c08\u6848\u8cc7\u6599\u593e\u6703\u9032\u5165 <code>(main|MERGING)<\/code> \u7684\u7279\u6b8a\u72c0\u614b\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\" id=\"2-%e6%89%80%e4%bb%a5%e6%80%8e%e8%be%a6\">2. \u6240\u4ee5\u600e\u8fa6 ?<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u9019\u6642\u5019\u5982\u679c\u4f60\u7528 <strong>VS Code<\/strong>\u6253\u958b <code>index.html<\/code>\uff0c\u4f60\u6703\u767c\u73fe\u7a0b\u5f0f\u78bc\u88ab Git \u585e\u4e86\u4e00\u4e9b\u5947\u602a\u7684\u7b26\u865f\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><span><code class=\"hljs\">&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\n&lt;p&gt;\u9019\u662f\u4e3b\u7dda\u5b87\u5b99\u6539\u5beb\u7684\u6587\u5b57&lt;\/p&gt;\n=======\n&lt;p&gt;\u9019\u662f\u5e73\u884c\u5b87\u5b99\u5b8c\u5168\u4e0d\u4e00\u6a23\u7684\u6587\u5b57\uff01\uff01\uff01&lt;\/p&gt;\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; feature\/conflict-test<\/code><\/span><\/pre>\n\n\n<ul class=\"wp-block-list\">\n<li><strong><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD<\/code><\/strong>\uff1a\u4ee3\u8868\u300c\u4f60\u76ee\u524d\u7ad9\u7684\u5206\u652f\uff08\u4e5f\u5c31\u662f <code>main<\/code>\uff09\u300d\u88e1\u9762\u7684\u5167\u5bb9\u3002<\/li>\n\n\n\n<li><strong><code>=======<\/code><\/strong>\uff1a\u695a\u6cb3\u6f22\u754c\u3002\u7528\u4f86\u9694\u958b\u96d9\u65b9\u7684\u4fee\u6539\u3002<\/li>\n\n\n\n<li><strong><code>&gt;&gt;&gt;&gt;&gt;&gt;&gt; feature\/conflict-test<\/code><\/strong>\uff1a\u4ee3\u8868\u300c\u4f60\u60f3\u5408\u9032\u4f86\u7684\u90a3\u500b\u5206\u652f\u300d\u88e1\u9762\u7684\u5167\u5bb9\u3002<\/li>\n<\/ul>\n\n\n\n<p class=\"wp-block-paragraph\">VS Code \u6703\u81ea\u52d5\u628a\u9019\u6bb5\u885d\u7a81\u67d3\u6210\u9192\u76ee\u7684\u984f\u8272\uff08\u7da0\u8272\u8207\u85cd\u8272\uff09\uff0c\u4e26\u5728\u6700\u4e0a\u65b9\u63d0\u4f9b\u56db\u500b\u9ede\u64ca\u6309\u9215\uff1a<\/p>\n\n\n\n<ol start=\"1\" class=\"wp-block-list\">\n<li><strong>Accept Current Change\uff08\u63a1\u7528\u76ee\u524d\u8b8a\u66f4\uff09\uff1a<\/strong> \u7559\u4e0b <code>main<\/code>\uff08\u4f60\u76ee\u524d\u7684\u7248\u672c\uff09\uff0c\u4e1f\u6389\u5206\u652f\u7684\u7248\u672c\u3002<\/li>\n\n\n\n<li><strong>Accept Incoming Change\uff08\u63a1\u7528\u4f86\u6e90\u8b8a\u66f4\uff09\uff1a<\/strong> \u7559\u4e0b\u5206\u652f\uff08\u5408\u9032\u4f86\u7684\u7248\u672c\uff09\uff0c\u4e1f\u6389\u4f60\u76ee\u524d\u7684\u7248\u672c\u3002<\/li>\n\n\n\n<li><strong>Accept Both Changes\uff08\u540c\u6642\u4fdd\u7559\u96d9\u65b9\uff09\uff1a<\/strong> \u5c0f\u5b69\u5b50\u624d\u505a\u9078\u64c7\uff0c\u5169\u884c\u6211\u90fd\u7559\uff01<\/li>\n\n\n\n<li><strong>Compare Changes\uff08\u6bd4\u8f03\u8b8a\u66f4\uff09\uff1a<\/strong> \u5e6b\u4f60\u5de6\u53f3\u5c0d\u9f4a\uff0c\u7d30\u7d30\u6bd4\u5c0d\u3002<\/li>\n<\/ol>\n\n\n\n<h3 class=\"wp-block-heading\" id=\"%e5%af%a6%e9%9a%9b%e8%a7%a3%e6%b3%95%e5%b7%a5%e4%bd%9c%e6%b5%81%ef%bc%9a\">\u5be6\u969b\u89e3\u6cd5\u5de5\u4f5c\u6d41\uff1a<\/h3>\n\n\n\n<ol start=\"1\" class=\"wp-block-list\">\n<li><strong>\u8ddf\u7576\u4e8b\u4eba\u8a0e\u8ad6\uff08\u6700\u91cd\u8981\uff09\uff1a<\/strong> \u53bb\u554f\u554f\u6539\u90a3\u884c\u7a0b\u5f0f\u78bc\u7684\u540c\u4e8b\uff0c\u78ba\u8a8d\u5230\u5e95\u8981\u628a\u8ab0\u7684\u6263\u7559\u4e0b\u4f86\u3002<\/li>\n\n\n\n<li><strong>\u9ede\u64ca\u6309\u9215\uff1a<\/strong> \u5728 VS Code \u4e0a\u9ede\u64ca\u4f60\u6c7a\u5b9a\u597d\u7684\u6309\u9215\uff08\u4f8b\u5982\u9ede\u9078 <em>Accept Both Changes<\/em>\uff09\u3002\u90a3\u4e9b\u5947\u602a\u7684 <code>&lt;&lt;&lt;<\/code>\u3001<code>===<\/code> \u7b26\u865f\u5c31\u6703\u77ac\u9593\u6d88\u5931\u3002<\/li>\n\n\n\n<li><strong>\u5b58\u6a94\u96e2\u958b\u3002<\/strong><\/li>\n<\/ol>\n\n\n\n<h2 class=\"wp-block-heading\" id=\"3-%e9%87%8d%e6%96%b0%e6%8f%90%e4%ba%a4\">3. <strong>\u91cd\u65b0\u63d0\u4ea4<\/strong><\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u7576\u4f60\u628a\u6a94\u6848\u88e1\u7684\u6240\u6709\u885d\u7a81\u7b26\u865f\u90fd\u6e05\u7406\u4e7e\u6de8\u3001\u7a0b\u5f0f\u78bc\u5b58\u6a94\u5f8c\uff0cGit \u9084\u5728\u7b49\u4f60\u7684\u6700\u5f8c\u4e00\u6b65\uff1a<strong>\u91cd\u65b0\u63d0\u4ea4<\/strong>\u3002<\/p>\n\n\n<pre class=\"wp-block-code\" aria-describedby=\"shcb-language-5\" data-shcb-language-name=\"PHP\" data-shcb-language-slug=\"php\"><span><code class=\"hljs language-php\"><span class=\"hljs-comment\"># 1. \u544a\u8a34 Git \u6211\u628a\u885d\u7a81\u6a94\u6848\u4fee\u597d\u4e86<\/span>\ngit add index.html\n\n<span class=\"hljs-comment\"># 2. \u91cd\u65b0 Commit\uff08\u901a\u5e38 Git \u6703\u81ea\u52d5\u5e6b\u4f60\u5beb\u597d \"Merge branch...\" \u7684\u9810\u8a2d\u8a0a\u606f\uff09<\/span>\ngit commit -m <span class=\"hljs-string\">\"fix: resolve merge conflict in index.html\"<\/span>\n<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-5\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">PHP<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">php<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre>\n\n\n<p class=\"wp-block-paragraph\">\u8f38\u5165\u5b8c\u5f8c\uff0c\u4f60\u6703\u767c\u73fe\u7d42\u7aef\u6a5f\u5f8c\u65b9\u7684 <code>|MERGING<\/code> \u6d88\u5931\u4e86\uff0c\u5c08\u6848\u91cd\u56de\u548c\u5e73\u7684\u72c0\u614b\u3002\u606d\u559c\u4f60\uff0c\u5b8c\u7f8e\u62c6\u5f48\uff01<\/p>\n\n\n\n<h2 class=\"wp-block-heading\" id=\"%e5%b0%8f%e7%b5%90\">\u5c0f\u7d50<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u9047\u5230 Conflict \u771f\u7684\u4e0d\u7528\u6015\uff0c\u5b83\u4ee3\u8868 Git \u6b63\u5728\u76e1\u5fe0\u8077\u5b88\u5730\u4fdd\u8b77\u4f60\u7684\u5c08\u6848\uff0c\u9632\u6b62\u4f60\u76f2\u76ee\u8986\u84cb\u6389\u5925\u4f34\u7684\u6210\u679c\u3002<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u885d\u7a81\u7684\u539f\u56e0\uff1a<strong>\u5169\u500b\u4eba\u5728\u4e0d\u540c\u7684\u5206\u652f\u6539\u4e86\u540c\u500b\u6a94\u6848\u7684\u540c\u4e00\u884c<\/strong>\u3002<\/li>\n\n\n\n<li>\u89e3\u6c7a\u7684\u5bc6\u78bc\uff1a\u8a8d\u6e05 <code>HEAD<\/code>\uff08\u81ea\u5df1\uff09\u8207 <code>Incoming<\/code>\uff08\u4ed6\u4eba\uff09\uff0c\u4e26\u7528 VS Code \u9ede\u9078\u6c7a\u5b9a\u3002<\/li>\n\n\n\n<li>\u62c6\u5f48\u5b8c\u7562\u5f8c\uff1a<strong>\u52d9\u5fc5\u91cd\u65b0 <code>git add<\/code> \u8207 <code>git commit<\/code><\/strong> \u624d\u80fd\u9806\u5229\u7d50\u675f\u5408\u4f75\u3002<\/li>\n<\/ul>\n\n\n\n<p class=\"wp-block-paragraph\">\u5230\u9019\u88e1\uff0c\u4f60\u5df2\u7d93\u638c\u63e1\u4e86 Git \u6700\u6838\u5fc3\u3001\u6700\u7cbe\u83ef\u3001\u9023\u8a31\u591a\u5be6\u7fd2\u751f\u90fd\u6703\u5361\u95dc\u7684\u6240\u6709\u6280\u8853\u3002\u4f60\u5df2\u7d93\u53ef\u4ee5\u8aaa\u81ea\u5df1\u300c\u6703\u7528 Git \u9032\u884c\u5718\u968a\u5354\u4f5c\u300d\u4e86\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5728\u524d\u9762\u5e7e\u7ae0\uff0c\u6211\u5011\u5b78\u6703\u4e86\u958b\u95e2\u5e73\u884c\u5b87\u5b99\uff08\u5206\u652f\uff09\u4ee5\u53ca\u5408\u4f75\uff08Merge\uff09\u3002Git \u901a\u5e38\u5f88\u8070\u660e\uff0c\u53ea\u8981\u5169\u500b\u4eba\u6539\u7684\u662f\u4e0d\u540c\u7684\u6a94\u6848\u3001\u6216\u662f\u540c\u500b\u6a94\u6848\u7684\u4e0d\u540c\u884c\uff0cGit \u90fd\u6703\u9ed8\u9ed8\u5730\u5e6b\u4f60\u81ea\u52d5\u5408\u9ad4\uff08Fast-forward \u6216\u81ea\u52d5\u5408\u4f75\uff09\u3002 \u4f46\u662f\uff0c\u5929\u6709\u4e0d\u6e2c\u98a8\u96f2\u3002 \u7576\u4e3b\u7dda\u5b87\u5b99\uff08main\uff09\u6709\u4eba\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\uff0c\u800c\u4f60\u7684\u5e73\u884c\u5b87\u5b99\uff08feature\uff09\u4e5f\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\u3002\u7576\u4f60\u5feb\u6a02\u5730\u8f38\u5165 git merge \u6642\u2026\u2026 \u6b64\u6642 Git \u6703\u4e0d\u77e5\u9053\u5230\u5e95\u300c\u8ab0\u6539\u7684\u624d\u662f\u5c0d\u7684\u300d\uff0c\u65bc\u662f\u5b83\u6703\u96d9\u624b\u4e00\u6524\uff0c\u628a\u6a94\u6848\u4e1f\u56de\u7d66\u4f60\uff0c\u53eb\u4f60\u81ea\u5df1\u8655\u7406\u597d\uff1a CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. \u9019\u5c31\u662f\u50b3\u8aaa\u4e2d\u7684\u885d\u7a81\u3002Git \u9078\u64c7\u4e0d\u64c5\u81ea\u4f5c\u4e3b\uff0c\u800c\u662f\u628a\u6c7a\u5b9a\u6b0a\u4ea4\u9084\u7d66\u4f60\u3002 1. \u6a21\u64ec\u885d\u7a81 \u70ba\u4e86\u5b78\u6703\u89e3\u885d\u7a81\uff0c\u6700\u597d\u7684\u65b9\u5f0f\u5c31\u662f\u81ea\u5df1\u641e\u51fa\u4e00\u5834\u885d\u7a81\u3002\u6211\u5011\u4f86\u5be6\u4f5c\u4e00\u6b21\uff1a \u6b65\u9a5f 1 \u5728 main \u5206\u652f\u6539\u52d5\u7b2c 3 \u884c\u3002\u78ba\u4fdd\u4f60\u5728 main \u5206\u652f\uff0c\u628a index.html \u7684\u7b2c 3 \u884c\u6539\u6210\uff1a \u7136\u5f8c\u6253\u5305\u63d0\u4ea4\uff1a [&hellip;]<\/p>\n","protected":false},"author":2,"featured_media":0,"parent":744,"menu_order":0,"comment_status":"closed","ping_status":"closed","template":"","meta":{"om_disable_all_campaigns":false,"_monsterinsights_skip_tracking":false,"footnotes":""},"class_list":["post-792","page","type-page","status-publish","hentry"],"aioseo_notices":[],"aioseo_head":"\n\t\t<!-- All in One SEO 4.9.10 - aioseo.com -->\n\t<meta name=\"description\" content=\"\u5728\u524d\u9762\u5e7e\u7ae0\uff0c\u6211\u5011\u5b78\u6703\u4e86\u958b\u95e2\u5e73\u884c\u5b87\u5b99\uff08\u5206\u652f\uff09\u4ee5\u53ca\u5408\u4f75\uff08Merge\uff09\u3002Git \u901a\u5e38\u5f88\u8070\u660e\uff0c\u53ea\u8981\u5169\u500b\u4eba\u6539\u7684\u662f\u4e0d\u540c\u7684\u6a94\u6848\u3001\u6216\u662f\u540c\u500b\u6a94\u6848\u7684\u4e0d\u540c\u884c\uff0cGit \u90fd\u6703\u9ed8\u9ed8\u5730\u5e6b\u4f60\u81ea\u52d5\u5408\u9ad4\uff08Fast-forward \u6216\u81ea\u52d5\u5408\u4f75\uff09\u3002 \u4f46\u662f\uff0c\u5929\u6709\u4e0d\u6e2c\u98a8\u96f2\u3002 \u7576\u4e3b\u7dda\u5b87\u5b99\uff08main\uff09\u6709\u4eba\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\uff0c\u800c\u4f60\u7684\u5e73\u884c\u5b87\u5b99\uff08feature\uff09\u4e5f\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\u3002\u7576\u4f60\u5feb\u6a02\u5730\u8f38\u5165 git merge \u6642\u2026\u2026 \u6b64\u6642 Git \u6703\u4e0d\u77e5\u9053\u5230\u5e95\u300c\u8ab0\u6539\u7684\u624d\u662f\u5c0d\u7684\u300d\uff0c\u65bc\u662f\u5b83\u6703\u96d9\u624b\u4e00\u6524\uff0c\u628a\u6a94\u6848\u4e1f\u56de\u7d66\u4f60\uff0c\u53eb\u4f60\u81ea\u5df1\u8655\u7406\u597d\uff1a CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. \u9019\u5c31\u662f\u50b3\u8aaa\u4e2d\u7684\u885d\u7a81\u3002Git \u9078\u64c7\u4e0d\u64c5\u81ea\u4f5c\u4e3b\uff0c\u800c\u662f\u628a\u6c7a\u5b9a\u6b0a\u4ea4\u9084\u7d66\u4f60\u3002 gitGraph commit id: &quot;\u5efa\u7acb\u5c08\u6848 (Line 3: \u539f\u59cb\u6587\u5b57)&quot; branch feature\/conflict-test checkout main commit id: &quot;main \u4fee\u6539 Line 3\" \/>\n\t<meta name=\"robots\" content=\"max-image-preview:large\" \/>\n\t<meta name=\"google-site-verification\" content=\"-324YR5tomynX5FeTW2lTMHIX0KmPBvpxjXpOhXwi1Q\" \/>\n\t<link rel=\"canonical\" href=\"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/\" \/>\n\t<meta name=\"generator\" content=\"All in One SEO (AIOSEO) 4.9.10\" \/>\n\t\t<meta property=\"og:locale\" content=\"en_US\" \/>\n\t\t<meta property=\"og:site_name\" content=\"HyC Wiki - Technical articles\" \/>\n\t\t<meta property=\"og:type\" content=\"article\" \/>\n\t\t<meta property=\"og:title\" content=\"7. Conflict \u885d\u7a81 - HyC Wiki\" \/>\n\t\t<meta property=\"og:description\" content=\"\u5728\u524d\u9762\u5e7e\u7ae0\uff0c\u6211\u5011\u5b78\u6703\u4e86\u958b\u95e2\u5e73\u884c\u5b87\u5b99\uff08\u5206\u652f\uff09\u4ee5\u53ca\u5408\u4f75\uff08Merge\uff09\u3002Git \u901a\u5e38\u5f88\u8070\u660e\uff0c\u53ea\u8981\u5169\u500b\u4eba\u6539\u7684\u662f\u4e0d\u540c\u7684\u6a94\u6848\u3001\u6216\u662f\u540c\u500b\u6a94\u6848\u7684\u4e0d\u540c\u884c\uff0cGit \u90fd\u6703\u9ed8\u9ed8\u5730\u5e6b\u4f60\u81ea\u52d5\u5408\u9ad4\uff08Fast-forward \u6216\u81ea\u52d5\u5408\u4f75\uff09\u3002 \u4f46\u662f\uff0c\u5929\u6709\u4e0d\u6e2c\u98a8\u96f2\u3002 \u7576\u4e3b\u7dda\u5b87\u5b99\uff08main\uff09\u6709\u4eba\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\uff0c\u800c\u4f60\u7684\u5e73\u884c\u5b87\u5b99\uff08feature\uff09\u4e5f\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\u3002\u7576\u4f60\u5feb\u6a02\u5730\u8f38\u5165 git merge \u6642\u2026\u2026 \u6b64\u6642 Git \u6703\u4e0d\u77e5\u9053\u5230\u5e95\u300c\u8ab0\u6539\u7684\u624d\u662f\u5c0d\u7684\u300d\uff0c\u65bc\u662f\u5b83\u6703\u96d9\u624b\u4e00\u6524\uff0c\u628a\u6a94\u6848\u4e1f\u56de\u7d66\u4f60\uff0c\u53eb\u4f60\u81ea\u5df1\u8655\u7406\u597d\uff1a CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. \u9019\u5c31\u662f\u50b3\u8aaa\u4e2d\u7684\u885d\u7a81\u3002Git \u9078\u64c7\u4e0d\u64c5\u81ea\u4f5c\u4e3b\uff0c\u800c\u662f\u628a\u6c7a\u5b9a\u6b0a\u4ea4\u9084\u7d66\u4f60\u3002 gitGraph commit id: &quot;\u5efa\u7acb\u5c08\u6848 (Line 3: \u539f\u59cb\u6587\u5b57)&quot; branch feature\/conflict-test checkout main commit id: &quot;main \u4fee\u6539 Line 3\" \/>\n\t\t<meta property=\"og:url\" content=\"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/\" \/>\n\t\t<meta property=\"og:image\" content=\"https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/06\/cropped-cropped-\u672a\u547d\u540d\u8a2d\u8a08-4.png\" \/>\n\t\t<meta property=\"og:image:secure_url\" content=\"https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/06\/cropped-cropped-\u672a\u547d\u540d\u8a2d\u8a08-4.png\" \/>\n\t\t<meta property=\"og:image:width\" content=\"64\" \/>\n\t\t<meta property=\"og:image:height\" content=\"64\" \/>\n\t\t<meta property=\"article:published_time\" content=\"2026-06-25T13:59:59+00:00\" \/>\n\t\t<meta property=\"article:modified_time\" content=\"2026-06-30T02:54:47+00:00\" \/>\n\t\t<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n\t\t<meta name=\"twitter:title\" content=\"7. Conflict \u885d\u7a81 - HyC Wiki\" \/>\n\t\t<meta name=\"twitter:description\" content=\"\u5728\u524d\u9762\u5e7e\u7ae0\uff0c\u6211\u5011\u5b78\u6703\u4e86\u958b\u95e2\u5e73\u884c\u5b87\u5b99\uff08\u5206\u652f\uff09\u4ee5\u53ca\u5408\u4f75\uff08Merge\uff09\u3002Git \u901a\u5e38\u5f88\u8070\u660e\uff0c\u53ea\u8981\u5169\u500b\u4eba\u6539\u7684\u662f\u4e0d\u540c\u7684\u6a94\u6848\u3001\u6216\u662f\u540c\u500b\u6a94\u6848\u7684\u4e0d\u540c\u884c\uff0cGit \u90fd\u6703\u9ed8\u9ed8\u5730\u5e6b\u4f60\u81ea\u52d5\u5408\u9ad4\uff08Fast-forward \u6216\u81ea\u52d5\u5408\u4f75\uff09\u3002 \u4f46\u662f\uff0c\u5929\u6709\u4e0d\u6e2c\u98a8\u96f2\u3002 \u7576\u4e3b\u7dda\u5b87\u5b99\uff08main\uff09\u6709\u4eba\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\uff0c\u800c\u4f60\u7684\u5e73\u884c\u5b87\u5b99\uff08feature\uff09\u4e5f\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\u3002\u7576\u4f60\u5feb\u6a02\u5730\u8f38\u5165 git merge \u6642\u2026\u2026 \u6b64\u6642 Git \u6703\u4e0d\u77e5\u9053\u5230\u5e95\u300c\u8ab0\u6539\u7684\u624d\u662f\u5c0d\u7684\u300d\uff0c\u65bc\u662f\u5b83\u6703\u96d9\u624b\u4e00\u6524\uff0c\u628a\u6a94\u6848\u4e1f\u56de\u7d66\u4f60\uff0c\u53eb\u4f60\u81ea\u5df1\u8655\u7406\u597d\uff1a CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. \u9019\u5c31\u662f\u50b3\u8aaa\u4e2d\u7684\u885d\u7a81\u3002Git \u9078\u64c7\u4e0d\u64c5\u81ea\u4f5c\u4e3b\uff0c\u800c\u662f\u628a\u6c7a\u5b9a\u6b0a\u4ea4\u9084\u7d66\u4f60\u3002 gitGraph commit id: &quot;\u5efa\u7acb\u5c08\u6848 (Line 3: \u539f\u59cb\u6587\u5b57)&quot; branch feature\/conflict-test checkout main commit id: &quot;main \u4fee\u6539 Line 3\" \/>\n\t\t<meta name=\"twitter:image\" content=\"https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/06\/cropped-cropped-\u672a\u547d\u540d\u8a2d\u8a08-4.png\" \/>\n\t\t<script type=\"application\/ld+json\" class=\"aioseo-schema\">\n\t\t\t{\"@context\":\"https:\\\/\\\/schema.org\",\"@graph\":[{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/6-conflict-%e8%a1%9d%e7%aa%81\\\/#breadcrumblist\",\"itemListElement\":[{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program#listItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\",\"nextItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/#listItem\",\"name\":\"\\u3010Git \\\/ GitHub \\u6559\\u5b78\\u3011\"}},{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/#listItem\",\"position\":2,\"name\":\"\\u3010Git \\\/ GitHub \\u6559\\u5b78\\u3011\",\"item\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/\",\"nextItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/6-conflict-%e8%a1%9d%e7%aa%81\\\/#listItem\",\"name\":\"7. Conflict \\u885d\\u7a81\"},\"previousItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program#listItem\",\"name\":\"Home\"}},{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/6-conflict-%e8%a1%9d%e7%aa%81\\\/#listItem\",\"position\":3,\"name\":\"7. Conflict \\u885d\\u7a81\",\"previousItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/#listItem\",\"name\":\"\\u3010Git \\\/ GitHub \\u6559\\u5b78\\u3011\"}}]},{\"@type\":\"Person\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/#person\",\"name\":\"H.Y. Chen\",\"image\":{\"@type\":\"ImageObject\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/6-conflict-%e8%a1%9d%e7%aa%81\\\/#personImage\",\"url\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/fc6e05e080c9ea570267ee9ed68c8b1841d745cee07c0331c5440646e0646603?s=96&d=mm&r=g\",\"width\":96,\"height\":96,\"caption\":\"H.Y. Chen\"}},{\"@type\":\"WebPage\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/6-conflict-%e8%a1%9d%e7%aa%81\\\/#webpage\",\"url\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/6-conflict-%e8%a1%9d%e7%aa%81\\\/\",\"name\":\"7. Conflict \\u885d\\u7a81 - HyC Wiki\",\"description\":\"\\u5728\\u524d\\u9762\\u5e7e\\u7ae0\\uff0c\\u6211\\u5011\\u5b78\\u6703\\u4e86\\u958b\\u95e2\\u5e73\\u884c\\u5b87\\u5b99\\uff08\\u5206\\u652f\\uff09\\u4ee5\\u53ca\\u5408\\u4f75\\uff08Merge\\uff09\\u3002Git \\u901a\\u5e38\\u5f88\\u8070\\u660e\\uff0c\\u53ea\\u8981\\u5169\\u500b\\u4eba\\u6539\\u7684\\u662f\\u4e0d\\u540c\\u7684\\u6a94\\u6848\\u3001\\u6216\\u662f\\u540c\\u500b\\u6a94\\u6848\\u7684\\u4e0d\\u540c\\u884c\\uff0cGit \\u90fd\\u6703\\u9ed8\\u9ed8\\u5730\\u5e6b\\u4f60\\u81ea\\u52d5\\u5408\\u9ad4\\uff08Fast-forward \\u6216\\u81ea\\u52d5\\u5408\\u4f75\\uff09\\u3002 \\u4f46\\u662f\\uff0c\\u5929\\u6709\\u4e0d\\u6e2c\\u98a8\\u96f2\\u3002 \\u7576\\u4e3b\\u7dda\\u5b87\\u5b99\\uff08main\\uff09\\u6709\\u4eba\\u6539\\u4e86 index.html \\u7684\\u7b2c 3 \\u884c\\uff0c\\u800c\\u4f60\\u7684\\u5e73\\u884c\\u5b87\\u5b99\\uff08feature\\uff09\\u4e5f\\u6539\\u4e86 index.html \\u7684\\u7b2c 3 \\u884c\\u3002\\u7576\\u4f60\\u5feb\\u6a02\\u5730\\u8f38\\u5165 git merge \\u6642\\u2026\\u2026 \\u6b64\\u6642 Git \\u6703\\u4e0d\\u77e5\\u9053\\u5230\\u5e95\\u300c\\u8ab0\\u6539\\u7684\\u624d\\u662f\\u5c0d\\u7684\\u300d\\uff0c\\u65bc\\u662f\\u5b83\\u6703\\u96d9\\u624b\\u4e00\\u6524\\uff0c\\u628a\\u6a94\\u6848\\u4e1f\\u56de\\u7d66\\u4f60\\uff0c\\u53eb\\u4f60\\u81ea\\u5df1\\u8655\\u7406\\u597d\\uff1a CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. \\u9019\\u5c31\\u662f\\u50b3\\u8aaa\\u4e2d\\u7684\\u885d\\u7a81\\u3002Git \\u9078\\u64c7\\u4e0d\\u64c5\\u81ea\\u4f5c\\u4e3b\\uff0c\\u800c\\u662f\\u628a\\u6c7a\\u5b9a\\u6b0a\\u4ea4\\u9084\\u7d66\\u4f60\\u3002 gitGraph commit id: \\\"\\u5efa\\u7acb\\u5c08\\u6848 (Line 3: \\u539f\\u59cb\\u6587\\u5b57)\\\" branch feature\\\/conflict-test checkout main commit id: \\\"main \\u4fee\\u6539 Line 3\",\"inLanguage\":\"en-US\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/#website\"},\"breadcrumb\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\\\/6-conflict-%e8%a1%9d%e7%aa%81\\\/#breadcrumblist\"},\"datePublished\":\"2026-06-25T13:59:59+00:00\",\"dateModified\":\"2026-06-30T02:54:47+00:00\"},{\"@type\":\"WebSite\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/#website\",\"url\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/\",\"name\":\"HyC Wiki\",\"description\":\"Technical articles\",\"inLanguage\":\"en-US\",\"publisher\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/#person\"}}]}\n\t\t<\/script>\n\t\t<!-- All in One SEO -->\n\n","aioseo_head_json":{"title":"7. Conflict \u885d\u7a81 - HyC Wiki","description":"\u5728\u524d\u9762\u5e7e\u7ae0\uff0c\u6211\u5011\u5b78\u6703\u4e86\u958b\u95e2\u5e73\u884c\u5b87\u5b99\uff08\u5206\u652f\uff09\u4ee5\u53ca\u5408\u4f75\uff08Merge\uff09\u3002Git \u901a\u5e38\u5f88\u8070\u660e\uff0c\u53ea\u8981\u5169\u500b\u4eba\u6539\u7684\u662f\u4e0d\u540c\u7684\u6a94\u6848\u3001\u6216\u662f\u540c\u500b\u6a94\u6848\u7684\u4e0d\u540c\u884c\uff0cGit \u90fd\u6703\u9ed8\u9ed8\u5730\u5e6b\u4f60\u81ea\u52d5\u5408\u9ad4\uff08Fast-forward \u6216\u81ea\u52d5\u5408\u4f75\uff09\u3002 \u4f46\u662f\uff0c\u5929\u6709\u4e0d\u6e2c\u98a8\u96f2\u3002 \u7576\u4e3b\u7dda\u5b87\u5b99\uff08main\uff09\u6709\u4eba\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\uff0c\u800c\u4f60\u7684\u5e73\u884c\u5b87\u5b99\uff08feature\uff09\u4e5f\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\u3002\u7576\u4f60\u5feb\u6a02\u5730\u8f38\u5165 git merge \u6642\u2026\u2026 \u6b64\u6642 Git \u6703\u4e0d\u77e5\u9053\u5230\u5e95\u300c\u8ab0\u6539\u7684\u624d\u662f\u5c0d\u7684\u300d\uff0c\u65bc\u662f\u5b83\u6703\u96d9\u624b\u4e00\u6524\uff0c\u628a\u6a94\u6848\u4e1f\u56de\u7d66\u4f60\uff0c\u53eb\u4f60\u81ea\u5df1\u8655\u7406\u597d\uff1a CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. \u9019\u5c31\u662f\u50b3\u8aaa\u4e2d\u7684\u885d\u7a81\u3002Git \u9078\u64c7\u4e0d\u64c5\u81ea\u4f5c\u4e3b\uff0c\u800c\u662f\u628a\u6c7a\u5b9a\u6b0a\u4ea4\u9084\u7d66\u4f60\u3002 gitGraph commit id: \"\u5efa\u7acb\u5c08\u6848 (Line 3: \u539f\u59cb\u6587\u5b57)\" branch feature\/conflict-test checkout main commit id: \"main \u4fee\u6539 Line 3","canonical_url":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/","robots":"max-image-preview:large","keywords":"","webmasterTools":{"google-site-verification":"-324YR5tomynX5FeTW2lTMHIX0KmPBvpxjXpOhXwi1Q","miscellaneous":""},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"BreadcrumbList","@id":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/#breadcrumblist","itemListElement":[{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program#listItem","position":1,"name":"Home","item":"https:\/\/hyc.eshachem.com\/program","nextItem":{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/#listItem","name":"\u3010Git \/ GitHub \u6559\u5b78\u3011"}},{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/#listItem","position":2,"name":"\u3010Git \/ GitHub \u6559\u5b78\u3011","item":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/","nextItem":{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/#listItem","name":"7. Conflict \u885d\u7a81"},"previousItem":{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program#listItem","name":"Home"}},{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/#listItem","position":3,"name":"7. Conflict \u885d\u7a81","previousItem":{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/#listItem","name":"\u3010Git \/ GitHub \u6559\u5b78\u3011"}}]},{"@type":"Person","@id":"https:\/\/hyc.eshachem.com\/program\/#person","name":"H.Y. Chen","image":{"@type":"ImageObject","@id":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/#personImage","url":"https:\/\/secure.gravatar.com\/avatar\/fc6e05e080c9ea570267ee9ed68c8b1841d745cee07c0331c5440646e0646603?s=96&d=mm&r=g","width":96,"height":96,"caption":"H.Y. Chen"}},{"@type":"WebPage","@id":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/#webpage","url":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/","name":"7. Conflict \u885d\u7a81 - HyC Wiki","description":"\u5728\u524d\u9762\u5e7e\u7ae0\uff0c\u6211\u5011\u5b78\u6703\u4e86\u958b\u95e2\u5e73\u884c\u5b87\u5b99\uff08\u5206\u652f\uff09\u4ee5\u53ca\u5408\u4f75\uff08Merge\uff09\u3002Git \u901a\u5e38\u5f88\u8070\u660e\uff0c\u53ea\u8981\u5169\u500b\u4eba\u6539\u7684\u662f\u4e0d\u540c\u7684\u6a94\u6848\u3001\u6216\u662f\u540c\u500b\u6a94\u6848\u7684\u4e0d\u540c\u884c\uff0cGit \u90fd\u6703\u9ed8\u9ed8\u5730\u5e6b\u4f60\u81ea\u52d5\u5408\u9ad4\uff08Fast-forward \u6216\u81ea\u52d5\u5408\u4f75\uff09\u3002 \u4f46\u662f\uff0c\u5929\u6709\u4e0d\u6e2c\u98a8\u96f2\u3002 \u7576\u4e3b\u7dda\u5b87\u5b99\uff08main\uff09\u6709\u4eba\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\uff0c\u800c\u4f60\u7684\u5e73\u884c\u5b87\u5b99\uff08feature\uff09\u4e5f\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\u3002\u7576\u4f60\u5feb\u6a02\u5730\u8f38\u5165 git merge \u6642\u2026\u2026 \u6b64\u6642 Git \u6703\u4e0d\u77e5\u9053\u5230\u5e95\u300c\u8ab0\u6539\u7684\u624d\u662f\u5c0d\u7684\u300d\uff0c\u65bc\u662f\u5b83\u6703\u96d9\u624b\u4e00\u6524\uff0c\u628a\u6a94\u6848\u4e1f\u56de\u7d66\u4f60\uff0c\u53eb\u4f60\u81ea\u5df1\u8655\u7406\u597d\uff1a CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. \u9019\u5c31\u662f\u50b3\u8aaa\u4e2d\u7684\u885d\u7a81\u3002Git \u9078\u64c7\u4e0d\u64c5\u81ea\u4f5c\u4e3b\uff0c\u800c\u662f\u628a\u6c7a\u5b9a\u6b0a\u4ea4\u9084\u7d66\u4f60\u3002 gitGraph commit id: \"\u5efa\u7acb\u5c08\u6848 (Line 3: \u539f\u59cb\u6587\u5b57)\" branch feature\/conflict-test checkout main commit id: \"main \u4fee\u6539 Line 3","inLanguage":"en-US","isPartOf":{"@id":"https:\/\/hyc.eshachem.com\/program\/#website"},"breadcrumb":{"@id":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/#breadcrumblist"},"datePublished":"2026-06-25T13:59:59+00:00","dateModified":"2026-06-30T02:54:47+00:00"},{"@type":"WebSite","@id":"https:\/\/hyc.eshachem.com\/program\/#website","url":"https:\/\/hyc.eshachem.com\/program\/","name":"HyC Wiki","description":"Technical articles","inLanguage":"en-US","publisher":{"@id":"https:\/\/hyc.eshachem.com\/program\/#person"}}]},"og:locale":"en_US","og:site_name":"HyC Wiki - Technical articles","og:type":"article","og:title":"7. Conflict \u885d\u7a81 - HyC Wiki","og:description":"\u5728\u524d\u9762\u5e7e\u7ae0\uff0c\u6211\u5011\u5b78\u6703\u4e86\u958b\u95e2\u5e73\u884c\u5b87\u5b99\uff08\u5206\u652f\uff09\u4ee5\u53ca\u5408\u4f75\uff08Merge\uff09\u3002Git \u901a\u5e38\u5f88\u8070\u660e\uff0c\u53ea\u8981\u5169\u500b\u4eba\u6539\u7684\u662f\u4e0d\u540c\u7684\u6a94\u6848\u3001\u6216\u662f\u540c\u500b\u6a94\u6848\u7684\u4e0d\u540c\u884c\uff0cGit \u90fd\u6703\u9ed8\u9ed8\u5730\u5e6b\u4f60\u81ea\u52d5\u5408\u9ad4\uff08Fast-forward \u6216\u81ea\u52d5\u5408\u4f75\uff09\u3002 \u4f46\u662f\uff0c\u5929\u6709\u4e0d\u6e2c\u98a8\u96f2\u3002 \u7576\u4e3b\u7dda\u5b87\u5b99\uff08main\uff09\u6709\u4eba\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\uff0c\u800c\u4f60\u7684\u5e73\u884c\u5b87\u5b99\uff08feature\uff09\u4e5f\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\u3002\u7576\u4f60\u5feb\u6a02\u5730\u8f38\u5165 git merge \u6642\u2026\u2026 \u6b64\u6642 Git \u6703\u4e0d\u77e5\u9053\u5230\u5e95\u300c\u8ab0\u6539\u7684\u624d\u662f\u5c0d\u7684\u300d\uff0c\u65bc\u662f\u5b83\u6703\u96d9\u624b\u4e00\u6524\uff0c\u628a\u6a94\u6848\u4e1f\u56de\u7d66\u4f60\uff0c\u53eb\u4f60\u81ea\u5df1\u8655\u7406\u597d\uff1a CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. \u9019\u5c31\u662f\u50b3\u8aaa\u4e2d\u7684\u885d\u7a81\u3002Git \u9078\u64c7\u4e0d\u64c5\u81ea\u4f5c\u4e3b\uff0c\u800c\u662f\u628a\u6c7a\u5b9a\u6b0a\u4ea4\u9084\u7d66\u4f60\u3002 gitGraph commit id: &quot;\u5efa\u7acb\u5c08\u6848 (Line 3: \u539f\u59cb\u6587\u5b57)&quot; branch feature\/conflict-test checkout main commit id: &quot;main \u4fee\u6539 Line 3","og:url":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/","og:image":"https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/06\/cropped-cropped-\u672a\u547d\u540d\u8a2d\u8a08-4.png","og:image:secure_url":"https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/06\/cropped-cropped-\u672a\u547d\u540d\u8a2d\u8a08-4.png","og:image:width":64,"og:image:height":64,"article:published_time":"2026-06-25T13:59:59+00:00","article:modified_time":"2026-06-30T02:54:47+00:00","twitter:card":"summary_large_image","twitter:title":"7. Conflict \u885d\u7a81 - HyC Wiki","twitter:description":"\u5728\u524d\u9762\u5e7e\u7ae0\uff0c\u6211\u5011\u5b78\u6703\u4e86\u958b\u95e2\u5e73\u884c\u5b87\u5b99\uff08\u5206\u652f\uff09\u4ee5\u53ca\u5408\u4f75\uff08Merge\uff09\u3002Git \u901a\u5e38\u5f88\u8070\u660e\uff0c\u53ea\u8981\u5169\u500b\u4eba\u6539\u7684\u662f\u4e0d\u540c\u7684\u6a94\u6848\u3001\u6216\u662f\u540c\u500b\u6a94\u6848\u7684\u4e0d\u540c\u884c\uff0cGit \u90fd\u6703\u9ed8\u9ed8\u5730\u5e6b\u4f60\u81ea\u52d5\u5408\u9ad4\uff08Fast-forward \u6216\u81ea\u52d5\u5408\u4f75\uff09\u3002 \u4f46\u662f\uff0c\u5929\u6709\u4e0d\u6e2c\u98a8\u96f2\u3002 \u7576\u4e3b\u7dda\u5b87\u5b99\uff08main\uff09\u6709\u4eba\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\uff0c\u800c\u4f60\u7684\u5e73\u884c\u5b87\u5b99\uff08feature\uff09\u4e5f\u6539\u4e86 index.html \u7684\u7b2c 3 \u884c\u3002\u7576\u4f60\u5feb\u6a02\u5730\u8f38\u5165 git merge \u6642\u2026\u2026 \u6b64\u6642 Git \u6703\u4e0d\u77e5\u9053\u5230\u5e95\u300c\u8ab0\u6539\u7684\u624d\u662f\u5c0d\u7684\u300d\uff0c\u65bc\u662f\u5b83\u6703\u96d9\u624b\u4e00\u6524\uff0c\u628a\u6a94\u6848\u4e1f\u56de\u7d66\u4f60\uff0c\u53eb\u4f60\u81ea\u5df1\u8655\u7406\u597d\uff1a CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. \u9019\u5c31\u662f\u50b3\u8aaa\u4e2d\u7684\u885d\u7a81\u3002Git \u9078\u64c7\u4e0d\u64c5\u81ea\u4f5c\u4e3b\uff0c\u800c\u662f\u628a\u6c7a\u5b9a\u6b0a\u4ea4\u9084\u7d66\u4f60\u3002 gitGraph commit id: &quot;\u5efa\u7acb\u5c08\u6848 (Line 3: \u539f\u59cb\u6587\u5b57)&quot; branch feature\/conflict-test checkout main commit id: &quot;main \u4fee\u6539 Line 3","twitter:image":"https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/06\/cropped-cropped-\u672a\u547d\u540d\u8a2d\u8a08-4.png"},"aioseo_meta_data":{"post_id":"792","title":null,"description":null,"keywords":null,"keyphrases":null,"primary_term":null,"canonical_url":null,"og_title":null,"og_description":null,"og_object_type":"default","og_image_type":"default","og_image_custom_url":null,"og_image_custom_fields":null,"og_image_url":null,"og_image_width":null,"og_image_height":null,"og_video":null,"og_custom_url":null,"og_article_section":null,"og_article_tags":null,"twitter_use_og":false,"twitter_card":"default","twitter_image_type":"default","twitter_image_custom_url":null,"twitter_image_custom_fields":null,"twitter_image_url":null,"twitter_title":null,"twitter_description":null,"schema_type":"default","schema_type_options":null,"schema":{"blockGraphs":[],"customGraphs":[],"default":{"data":{"Article":[],"Course":[],"Dataset":[],"FAQPage":[],"Movie":[],"Person":[],"Product":[],"ProductReview":[],"Car":[],"Recipe":[],"Service":[],"SoftwareApplication":[],"WebPage":[]},"graphName":"","isEnabled":true},"graphs":[]},"pillar_content":false,"robots_default":true,"robots_noindex":false,"robots_noarchive":false,"robots_nosnippet":false,"robots_nofollow":false,"robots_noimageindex":false,"robots_noodp":false,"robots_notranslate":false,"robots_max_snippet":null,"robots_max_videopreview":null,"robots_max_imagepreview":"large","priority":null,"frequency":null,"local_seo":null,"limit_modified_date":false,"ai":null,"breadcrumb_settings":null,"seo_analyzer_scan_date":null,"created":"2026-07-28 14:27:59","updated":"2026-07-28 14:27:59"},"aioseo_breadcrumb":"<div class=\"aioseo-breadcrumbs\"><span class=\"aioseo-breadcrumb\">\n\t\t\t<a href=\"https:\/\/hyc.eshachem.com\/program\" title=\"Home\">Home<\/a>\n\t\t<\/span><span class=\"aioseo-breadcrumb-separator\">&raquo;<\/span><span class=\"aioseo-breadcrumb\">\n\t\t\t<a href=\"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/\" title=\"\u3010Git \/ GitHub \u6559\u5b78\u3011\">\u3010Git \/ GitHub \u6559\u5b78\u3011<\/a>\n\t\t<\/span><span class=\"aioseo-breadcrumb-separator\">&raquo;<\/span><span class=\"aioseo-breadcrumb\">\n\t\t\t7. Conflict \u885d\u7a81\n\t\t<\/span><\/div>","aioseo_breadcrumb_json":[{"label":"Home","link":"https:\/\/hyc.eshachem.com\/program"},{"label":"\u3010Git \/ GitHub \u6559\u5b78\u3011","link":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/"},{"label":"7. Conflict \u885d\u7a81","link":"https:\/\/hyc.eshachem.com\/program\/%e3%80%90git-github-%e6%95%99%e5%ad%b8%e3%80%91\/6-conflict-%e8%a1%9d%e7%aa%81\/"}],"_links":{"self":[{"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/pages\/792","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/pages"}],"about":[{"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/types\/page"}],"author":[{"embeddable":true,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/comments?post=792"}],"version-history":[{"count":3,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/pages\/792\/revisions"}],"predecessor-version":[{"id":872,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/pages\/792\/revisions\/872"}],"up":[{"embeddable":true,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/pages\/744"}],"wp:attachment":[{"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/media?parent=792"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}