{"id":306,"date":"2026-04-14T12:57:51","date_gmt":"2026-04-14T12:57:51","guid":{"rendered":"https:\/\/hyc.eshachem.com\/program\/?p=306"},"modified":"2026-05-03T09:54:46","modified_gmt":"2026-05-03T09:54:46","slug":"git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88","status":"publish","type":"post","link":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/","title":{"rendered":"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848"},"content":{"rendered":"\n<p class=\"wp-block-paragraph\">\u5982\u679cA\u3001B\u5169\u500b\u4eba\u90fd\u5728\u4fee\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5728A\u540c\u5b78Merge\u5f8cB\u540c\u5b78\u7684Merge\u5c31\u6703\u51fa\u73fe\u554f\u984c\u4e86\uff0c\u9019\u6642\u6211\u5011\u53ef\u4ee5\u5feb\u901f\u7684\u5728VSCode\u4e0a\u89e3\u6c7a:<\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\">\n\n\n\n<p class=\"wp-block-paragraph\">\u7576\u540c\u5b78A\u3001B\u5169\u500b\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4e14\u9047\u5230\u90fd\u6709\u4fee\u6539\u5230\u540c\u4e00\u884c\u7684\u60c5\u6cc1\u6642\uff0c\u7576\u540c\u5b78A\u5148Merged\u5f8c\u540c\u5b78B\u7684Merge Request\u5c31\u6703\u51fa\u73fe\u4e0b\u9762\u7684\u932f\u8aa4\uff0c\u986f\u793a\u5408\u4f75\u885d\u7a81\u9700\u8981\u88ab\u89e3\u6c7a<\/p>\n\n\n\n<figure class=\"wp-block-image size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"874\" height=\"521\" src=\"https:\/\/i0.wp.com\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image.png?fit=874%2C521&amp;ssl=1\" alt=\"\" class=\"wp-image-309\" srcset=\"https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image.png 874w, https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-300x179.png 300w, https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-768x458.png 768w\" sizes=\"auto, (max-width: 874px) 100vw, 874px\" \/><\/figure>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\">\n<p class=\"wp-block-paragraph\">\u89e3\u6cd5\u662f\u53e6\u5916\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f\uff0c\u4e26\u5c07\u540c\u5b78A\u3001B\u7684\u885d\u7a81\u5728\u9019\u500b\u5206\u652f\u89e3\u6c7a\u5f8c\uff0c\u5c07\u9019\u500b\u81e8\u6642\u5206\u652f\u8207upstream\/development\u5408\u4f75<\/p>\n<\/blockquote>\n\n\n\n<h1 class=\"wp-block-heading\" id=\"%e8%a7%a3%e6%b1%ba%e8%a1%9d%e7%aa%81\">\u89e3\u6c7a\u885d\u7a81<\/h1>\n\n\n\n<h2 class=\"wp-block-heading\" id=\"%e5%bb%ba%e7%ab%8b%e8%87%a8%e6%99%82%e5%88%86%e6%94%af\">\u5efa\u7acb\u81e8\u6642\u5206\u652f<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u5728VSCode\u4e2d\u6253\u958b\u5c08\u6848\u5f8c\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><code>git checkout -b resolve-team-conflict upstream\/development<\/code><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u7cfb\u7d71\u6703\u56de\u50b3\u5275\u5efa\u6210\u529f\u4e26\u4e14\u5c07\u4f60\u8f49\u79fb\u81f3\u8a72\u81e8\u6642\u5206\u652f(<code>resolve-team-conflict<\/code>)\u4e0a:<\/p>\n\n\n<pre class=\"wp-block-code\" aria-describedby=\"shcb-language-1\" data-shcb-language-name=\"PHP\" data-shcb-language-slug=\"php\"><span><code class=\"hljs language-php\">PS C:\\git\\git-practice1&gt; git checkout -b resolve-team-conflict upstream\/development\nbranch <span class=\"hljs-string\">'resolve-team-conflict'<\/span> set up to track <span class=\"hljs-string\">'upstream\/development'<\/span>.\nSwitched to a <span class=\"hljs-keyword\">new<\/span> branch <span class=\"hljs-string\">'resolve-team-conflict'<\/span><\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-1\"><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\">\u6b64\u6642\u53bbFork\u4e2d\u770b\u6703\u767c\u73fe\u8b8a\u6210 <code>\u2714\ufe0fresolve-team-conflict<\/code><\/p>\n\n\n\n<figure class=\"wp-block-image size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"835\" height=\"347\" src=\"https:\/\/i0.wp.com\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-1.png?fit=835%2C347&amp;ssl=1\" alt=\"\" class=\"wp-image-312\" srcset=\"https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-1.png 835w, https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-1-300x125.png 300w, https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-1-768x319.png 768w\" sizes=\"auto, (max-width: 835px) 100vw, 835px\" \/><\/figure>\n\n\n\n<p class=\"wp-block-paragraph\">\u63a5\u8457\u5efa\u7acb<code>mr-member-b<\/code> \u5206\u652f\u4e26\u628a\u6b63\u5728MR\u7684B\u540c\u5b78\u62c9\u5230 <code>mr-member-b<\/code> \u5206\u652f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><code>git fetch upstream merge-requests\/&lt;MR_ID&gt;\/head:mr-member-b<\/code><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">MR ID\u70baGitLab\u4e0a\uff0c\u8a72\u7b46MR\u5de6\u4e0b\u89d2\u7684\u6578\u5b57<\/p>\n\n\n\n<figure class=\"wp-block-image size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"247\" height=\"43\" src=\"https:\/\/i0.wp.com\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-2.png?fit=247%2C43&amp;ssl=1\" alt=\"\" class=\"wp-image-313\"><\/figure>\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\">PS C:\\git\\git-practice1&gt; git fetch upstream merge-requests\/<span class=\"hljs-number\">4<\/span>\/head:mr-member-b\n<span class=\"hljs-attr\">remote<\/span>: Enumerating objects: <span class=\"hljs-number\">3<\/span>, done.\nremote: Counting objects: <span class=\"hljs-number\">100<\/span>% (<span class=\"hljs-number\">1<\/span>\/<span class=\"hljs-number\">1<\/span>), done.\nremote: Total <span class=\"hljs-number\">3<\/span> (delta <span class=\"hljs-number\">1<\/span>), reused <span class=\"hljs-number\">1<\/span> (delta <span class=\"hljs-number\">1<\/span>), pack-reused <span class=\"hljs-number\">2<\/span> (<span class=\"hljs-keyword\">from<\/span> <span class=\"hljs-number\">1<\/span>)\nUnpacking objects: <span class=\"hljs-number\">100<\/span>% (<span class=\"hljs-number\">3<\/span>\/<span class=\"hljs-number\">3<\/span>), <span class=\"hljs-number\">300<\/span> bytes | <span class=\"hljs-number\">27.00<\/span> KiB\/s, done.\nFrom https:<span class=\"hljs-comment\">\/\/gitlab.com\/git-course11\/git-practice1<\/span>\n* [<span class=\"hljs-keyword\">new<\/span> ref] refs\/merge-requests\/<span class=\"hljs-number\">4<\/span>\/head -&gt; mr-member-b<\/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<h2 class=\"wp-block-heading\" id=\"%e5%90%88%e4%bd%b5%e9%9b%99%e6%96%b9%e7%a8%8b%e5%bc%8f%e7%a2%bc\">\u5408\u4f75\u96d9\u65b9\u7a0b\u5f0f\u78bc<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u56e0\u70baA\u540c\u5b78\u5df2\u7d93\u88abMerge\uff0c\u6240\u4ee5\u6211\u5011\u5148\u5c07upstream\/development\u4e0a\u7684\u6771\u897fmerge\u9032\u9019\u689d\u5206\u652f<\/p>\n\n\n\n<p class=\"wp-block-paragraph\"><code>git merge upstream\/development<\/code><\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u63a5\u8457\u6211\u5011\u518d\u628aB\u540c\u5b78\u7684\u5167\u5bb9merge\u9032<code>resolve-team-conflict<\/code><\/p>\n\n\n<pre class=\"wp-block-code\" aria-describedby=\"shcb-language-3\" data-shcb-language-name=\"CSS\" data-shcb-language-slug=\"css\"><span><code class=\"hljs language-css\"><span class=\"hljs-selector-tag\">PS<\/span> <span class=\"hljs-selector-tag\">C<\/span>:\\<span class=\"hljs-selector-tag\">git<\/span>\\<span class=\"hljs-selector-tag\">git-practice1<\/span>&gt; <span class=\"hljs-selector-tag\">git<\/span> <span class=\"hljs-selector-tag\">merge<\/span> <span class=\"hljs-selector-tag\">mr-member-b<\/span>\n<span class=\"hljs-selector-tag\">Auto-merging<\/span> <span class=\"hljs-selector-tag\">README<\/span><span class=\"hljs-selector-class\">.md<\/span>\n<span class=\"hljs-selector-tag\">CONFLICT<\/span> (<span class=\"hljs-selector-tag\">content<\/span>): <span class=\"hljs-selector-tag\">Merge<\/span> <span class=\"hljs-selector-tag\">conflict<\/span> <span class=\"hljs-selector-tag\">in<\/span> <span class=\"hljs-selector-tag\">README<\/span><span class=\"hljs-selector-class\">.md<\/span>\n<span class=\"hljs-selector-tag\">Automatic<\/span> <span class=\"hljs-selector-tag\">merge<\/span> <span class=\"hljs-selector-tag\">failed<\/span>; <span class=\"hljs-selector-tag\">fix<\/span> <span class=\"hljs-selector-tag\">conflicts<\/span> <span class=\"hljs-selector-tag\">and<\/span> <span class=\"hljs-selector-tag\">then<\/span> <span class=\"hljs-selector-tag\">commit<\/span> <span class=\"hljs-selector-tag\">the<\/span> <span class=\"hljs-selector-tag\">result<\/span>.<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-3\"><span class=\"shcb-language__label\">Code language:<\/span> <span class=\"shcb-language__name\">CSS<\/span> <span class=\"shcb-language__paren\">(<\/span><span class=\"shcb-language__slug\">css<\/span><span class=\"shcb-language__paren\">)<\/span><\/small><\/pre>\n\n\n<p class=\"wp-block-paragraph\">\u6b64\u6642VSCode\u5c31\u6703\u51fa\u73fe <code>&gt;&gt;&gt;<\/code> , <code>&lt;&lt;&lt;<\/code> , <code>===<\/code> \u7b26\u865f<\/p>\n\n\n\n<figure class=\"wp-block-image size-full\"><img loading=\"lazy\" decoding=\"async\" width=\"402\" height=\"179\" src=\"https:\/\/i0.wp.com\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-3.png?fit=402%2C179&amp;ssl=1\" alt=\"\" class=\"wp-image-314\" srcset=\"https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-3.png 402w, https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-3-300x134.png 300w\" sizes=\"auto, (max-width: 402px) 100vw, 402px\" \/><\/figure>\n\n\n\n<p class=\"wp-block-paragraph\">\u518d\u6839\u64da\u60c5\u6cc1\u9078\u64c7\u8981\u63a5\u53d7\u54ea\u7a2e\u8b8a\u66f4\u5373\u53ef!!<\/p>\n\n\n\n<h1 class=\"wp-block-heading\" id=\"%e7%b5%90%e6%9d%9f%e8%a1%9d%e7%aa%81\">\u7d50\u675f\u885d\u7a81<\/h1>\n\n\n\n<p class=\"wp-block-paragraph\">\u63a5\u8457\u8981\u5c07 <code>resolve-team-conflict<\/code> \u5408\u4f75\u5230 upstream\/development<\/p>\n\n\n<pre class=\"wp-block-code\" aria-describedby=\"shcb-language-4\" data-shcb-language-name=\"PHP\" data-shcb-language-slug=\"php\"><span><code class=\"hljs language-php\"><span class=\"hljs-comment\"># 1. \u544a\u8a34 Git \u9019\u500b\u6a94\u6848\u6211\u4fee\u597d\u4e86<\/span>\nPS C:\\git\\git-practice1&gt;  git add README.md    \n\n<span class=\"hljs-comment\"># 2. \u5b8c\u6210\u5408\u4f75\u63d0\u4ea4 (Commit)<\/span>\nPS C:\\git\\git-practice1&gt; git commit -m <span class=\"hljs-string\">\"Merge: resolve README.md conflict between member A and B\"<\/span>\n\ngit push origin resolve-team-conflict<\/code><\/span><small class=\"shcb-language\" id=\"shcb-language-4\"><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\">Push\u6210\u529f\u5f8c\u5c31\u53ef\u4ee5\u53bbGitLab\u5c07\u540c\u5b78B\u7684MR\u95dc\u6389\u4e26\u767c\u9001 MR \u5566!!<\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img loading=\"lazy\" decoding=\"async\" width=\"1206\" height=\"337\" src=\"https:\/\/i0.wp.com\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-4.png?fit=1024%2C286&amp;ssl=1\" alt=\"\" class=\"wp-image-315\" srcset=\"https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-4.png 1206w, https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-4-300x84.png 300w, https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-4-1024x286.png 1024w, https:\/\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image-4-768x215.png 768w\" sizes=\"auto, (max-width: 1206px) 100vw, 1206px\" \/><\/figure>\n\n\n\n<p class=\"wp-block-paragraph\"><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5982\u679cA\u3001B\u5169\u500b\u4eba\u90fd\u5728\u4fee\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5728A\u540c\u5b78Merge\u5f8cB\u540c\u5b78\u7684Merge\u5c31\u6703\u51fa\u73fe\u554f\u984c\u4e86\uff0c\u9019\u6642\u6211\u5011\u53ef\u4ee5\u5feb\u901f\u7684\u5728VSCode\u4e0a\u89e3\u6c7a: \u7576\u540c\u5b78A\u3001B\u5169\u500b\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4e14\u9047\u5230\u90fd\u6709\u4fee\u6539\u5230\u540c\u4e00\u884c\u7684\u60c5\u6cc1\u6642\uff0c\u7576\u540c\u5b78A\u5148Merged\u5f8c\u540c\u5b78B\u7684Merge Request\u5c31\u6703\u51fa\u73fe\u4e0b\u9762\u7684\u932f\u8aa4\uff0c\u986f\u793a\u5408\u4f75\u885d\u7a81\u9700\u8981\u88ab\u89e3\u6c7a \u89e3\u6cd5\u662f\u53e6\u5916\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f\uff0c\u4e26\u5c07\u540c\u5b78A\u3001B\u7684\u885d\u7a81\u5728\u9019\u500b\u5206\u652f\u89e3\u6c7a\u5f8c\uff0c\u5c07\u9019\u500b\u81e8\u6642\u5206\u652f\u8207upstream\/development\u5408\u4f75 \u89e3\u6c7a\u885d\u7a81 \u5efa\u7acb\u81e8\u6642\u5206\u652f \u5728VSCode\u4e2d\u6253\u958b\u5c08\u6848\u5f8c\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f git checkout -b resolve-team-conflict upstream\/development \u7cfb\u7d71\u6703\u56de\u50b3\u5275\u5efa\u6210\u529f\u4e26\u4e14\u5c07\u4f60\u8f49\u79fb\u81f3\u8a72\u81e8\u6642\u5206\u652f(resolve-team-conflict)\u4e0a: \u6b64\u6642\u53bbFork\u4e2d\u770b\u6703\u767c\u73fe\u8b8a\u6210 \u2714\ufe0fresolve-team-conflict \u63a5\u8457\u5efa\u7acbmr-member-b \u5206\u652f\u4e26\u628a\u6b63\u5728MR\u7684B\u540c\u5b78\u62c9\u5230 mr-member-b \u5206\u652f git fetch upstream merge-requests\/&lt;MR_ID&gt;\/head:mr-member-b MR ID\u70baGitLab\u4e0a\uff0c\u8a72\u7b46MR\u5de6\u4e0b\u89d2\u7684\u6578\u5b57 \u5408\u4f75\u96d9\u65b9\u7a0b\u5f0f\u78bc \u56e0\u70baA\u540c\u5b78\u5df2\u7d93\u88abMerge\uff0c\u6240\u4ee5\u6211\u5011\u5148\u5c07upstream\/development\u4e0a\u7684\u6771\u897fmerge\u9032\u9019\u689d\u5206\u652f git merge upstream\/development \u63a5\u8457\u6211\u5011\u518d\u628aB\u540c\u5b78\u7684\u5167\u5bb9merge\u9032resolve-team-conflict \u6b64\u6642VSCode\u5c31\u6703\u51fa\u73fe &gt;&gt;&gt; , &lt;&lt;&lt; , === \u7b26\u865f \u518d\u6839\u64da\u60c5\u6cc1\u9078\u64c7\u8981\u63a5\u53d7\u54ea\u7a2e\u8b8a\u66f4\u5373\u53ef!! \u7d50\u675f\u885d\u7a81 \u63a5\u8457\u8981\u5c07 resolve-team-conflict \u5408\u4f75\u5230 upstream\/development Push\u6210\u529f\u5f8c\u5c31\u53ef\u4ee5\u53bbGitLab\u5c07\u540c\u5b78B\u7684MR\u95dc\u6389\u4e26\u767c\u9001 MR \u5566!!<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"om_disable_all_campaigns":false,"_monsterinsights_skip_tracking":false,"footnotes":""},"categories":[40],"tags":[],"class_list":["post-306","post","type-post","status-publish","format-standard","hentry","category-git"],"aioseo_notices":[],"aioseo_head":"\n\t\t<!-- All in One SEO 4.9.10 - aioseo.com -->\n\t<meta name=\"description\" content=\"\u5982\u679cA\u3001B\u5169\u500b\u4eba\u90fd\u5728\u4fee\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5728A\u540c\u5b78Merge\u5f8cB\u540c\u5b78\u7684Merge\u5c31\u6703\u51fa\u73fe\u554f\u984c\u4e86\uff0c\u9019\u6642\u6211\u5011\u53ef\u4ee5\u5feb\u901f\u7684\u5728VSCode\u4e0a\u89e3\u6c7a: \u7576\u540c\u5b78A\u3001B\u5169\u500b\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4e14\u9047\u5230\u90fd\u6709\u4fee\u6539\u5230\u540c\u4e00\u884c\u7684\u60c5\u6cc1\u6642\uff0c\u7576\u540c\u5b78A\u5148Merged\u5f8c\u540c\u5b78B\u7684Merge Request\u5c31\u6703\u51fa\u73fe\u4e0b\u9762\u7684\u932f\u8aa4\uff0c\u986f\u793a\u5408\u4f75\u885d\u7a81\u9700\u8981\u88ab\u89e3\u6c7a \u89e3\u6cd5\u662f\u53e6\u5916\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f\uff0c\u4e26\u5c07\u540c\u5b78A\u3001B\u7684\u885d\u7a81\u5728\u9019\u500b\u5206\u652f\u89e3\u6c7a\u5f8c\uff0c\u5c07\u9019\u500b\u81e8\u6642\u5206\u652f\u8207upstream\/development\u5408\u4f75 \u89e3\u6c7a\u885d\u7a81 \u5efa\u7acb\u81e8\u6642\u5206\u652f \u5728VSCode\u4e2d\u6253\u958b\u5c08\u6848\u5f8c\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f git checkout -b resolve-team-conflict upstream\/development \u7cfb\u7d71\u6703\u56de\u50b3\u5275\u5efa\u6210\u529f\u4e26\u4e14\u5c07\u4f60\u8f49\u79fb\u81f3\u8a72\u81e8\u6642\u5206\u652f(resolve-team-conflict)\u4e0a: PS C:\\git\\git-practice1&gt; git checkout -b resolve-team-conflict upstream\/development branch &#039;resolve-team-conflict&#039; set up to track &#039;upstream\/development&#039;. Switched to a new branch &#039;resolve-team-conflict&#039; \u6b64\u6642\u53bbFork\u4e2d\u770b\u6703\u767c\u73fe\u8b8a\u6210 \u2714\ufe0fresolve-team-conflict \u63a5\u8457\u5efa\u7acbmr-member-b \u5206\u652f\u4e26\u628a\u6b63\u5728MR\u7684B\u540c\u5b78\u62c9\u5230 mr-member-b \u5206\u652f git fetch upstream merge-requests\/\/head:mr-member-b MR ID\u70baGitLab\u4e0a\uff0c\u8a72\u7b46MR\u5de6\u4e0b\u89d2\u7684\u6578\u5b57 PS C:\\git\\git-practice1&gt; git fetch upstream merge-requests\/4\/head:mr-member-b remote: Enumerating objects: 3,\" \/>\n\t<meta name=\"robots\" content=\"max-image-preview:large\" \/>\n\t<meta name=\"author\" content=\"H.Y. Chen\"\/>\n\t<meta name=\"google-site-verification\" content=\"-324YR5tomynX5FeTW2lTMHIX0KmPBvpxjXpOhXwi1Q\" \/>\n\t<link rel=\"canonical\" href=\"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/\" \/>\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=\"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848 - HyC Wiki\" \/>\n\t\t<meta property=\"og:description\" content=\"\u5982\u679cA\u3001B\u5169\u500b\u4eba\u90fd\u5728\u4fee\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5728A\u540c\u5b78Merge\u5f8cB\u540c\u5b78\u7684Merge\u5c31\u6703\u51fa\u73fe\u554f\u984c\u4e86\uff0c\u9019\u6642\u6211\u5011\u53ef\u4ee5\u5feb\u901f\u7684\u5728VSCode\u4e0a\u89e3\u6c7a: \u7576\u540c\u5b78A\u3001B\u5169\u500b\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4e14\u9047\u5230\u90fd\u6709\u4fee\u6539\u5230\u540c\u4e00\u884c\u7684\u60c5\u6cc1\u6642\uff0c\u7576\u540c\u5b78A\u5148Merged\u5f8c\u540c\u5b78B\u7684Merge Request\u5c31\u6703\u51fa\u73fe\u4e0b\u9762\u7684\u932f\u8aa4\uff0c\u986f\u793a\u5408\u4f75\u885d\u7a81\u9700\u8981\u88ab\u89e3\u6c7a \u89e3\u6cd5\u662f\u53e6\u5916\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f\uff0c\u4e26\u5c07\u540c\u5b78A\u3001B\u7684\u885d\u7a81\u5728\u9019\u500b\u5206\u652f\u89e3\u6c7a\u5f8c\uff0c\u5c07\u9019\u500b\u81e8\u6642\u5206\u652f\u8207upstream\/development\u5408\u4f75 \u89e3\u6c7a\u885d\u7a81 \u5efa\u7acb\u81e8\u6642\u5206\u652f \u5728VSCode\u4e2d\u6253\u958b\u5c08\u6848\u5f8c\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f git checkout -b resolve-team-conflict upstream\/development \u7cfb\u7d71\u6703\u56de\u50b3\u5275\u5efa\u6210\u529f\u4e26\u4e14\u5c07\u4f60\u8f49\u79fb\u81f3\u8a72\u81e8\u6642\u5206\u652f(resolve-team-conflict)\u4e0a: PS C:\\git\\git-practice1&gt; git checkout -b resolve-team-conflict upstream\/development branch &#039;resolve-team-conflict&#039; set up to track &#039;upstream\/development&#039;. Switched to a new branch &#039;resolve-team-conflict&#039; \u6b64\u6642\u53bbFork\u4e2d\u770b\u6703\u767c\u73fe\u8b8a\u6210 \u2714\ufe0fresolve-team-conflict \u63a5\u8457\u5efa\u7acbmr-member-b \u5206\u652f\u4e26\u628a\u6b63\u5728MR\u7684B\u540c\u5b78\u62c9\u5230 mr-member-b \u5206\u652f git fetch upstream merge-requests\/\/head:mr-member-b MR ID\u70baGitLab\u4e0a\uff0c\u8a72\u7b46MR\u5de6\u4e0b\u89d2\u7684\u6578\u5b57 PS C:\\git\\git-practice1&gt; git fetch upstream merge-requests\/4\/head:mr-member-b remote: Enumerating objects: 3,\" \/>\n\t\t<meta property=\"og:url\" content=\"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/\" \/>\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-04-14T12:57:51+00:00\" \/>\n\t\t<meta property=\"article:modified_time\" content=\"2026-05-03T09:54:46+00:00\" \/>\n\t\t<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n\t\t<meta name=\"twitter:title\" content=\"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848 - HyC Wiki\" \/>\n\t\t<meta name=\"twitter:description\" content=\"\u5982\u679cA\u3001B\u5169\u500b\u4eba\u90fd\u5728\u4fee\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5728A\u540c\u5b78Merge\u5f8cB\u540c\u5b78\u7684Merge\u5c31\u6703\u51fa\u73fe\u554f\u984c\u4e86\uff0c\u9019\u6642\u6211\u5011\u53ef\u4ee5\u5feb\u901f\u7684\u5728VSCode\u4e0a\u89e3\u6c7a: \u7576\u540c\u5b78A\u3001B\u5169\u500b\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4e14\u9047\u5230\u90fd\u6709\u4fee\u6539\u5230\u540c\u4e00\u884c\u7684\u60c5\u6cc1\u6642\uff0c\u7576\u540c\u5b78A\u5148Merged\u5f8c\u540c\u5b78B\u7684Merge Request\u5c31\u6703\u51fa\u73fe\u4e0b\u9762\u7684\u932f\u8aa4\uff0c\u986f\u793a\u5408\u4f75\u885d\u7a81\u9700\u8981\u88ab\u89e3\u6c7a \u89e3\u6cd5\u662f\u53e6\u5916\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f\uff0c\u4e26\u5c07\u540c\u5b78A\u3001B\u7684\u885d\u7a81\u5728\u9019\u500b\u5206\u652f\u89e3\u6c7a\u5f8c\uff0c\u5c07\u9019\u500b\u81e8\u6642\u5206\u652f\u8207upstream\/development\u5408\u4f75 \u89e3\u6c7a\u885d\u7a81 \u5efa\u7acb\u81e8\u6642\u5206\u652f \u5728VSCode\u4e2d\u6253\u958b\u5c08\u6848\u5f8c\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f git checkout -b resolve-team-conflict upstream\/development \u7cfb\u7d71\u6703\u56de\u50b3\u5275\u5efa\u6210\u529f\u4e26\u4e14\u5c07\u4f60\u8f49\u79fb\u81f3\u8a72\u81e8\u6642\u5206\u652f(resolve-team-conflict)\u4e0a: PS C:\\git\\git-practice1&gt; git checkout -b resolve-team-conflict upstream\/development branch &#039;resolve-team-conflict&#039; set up to track &#039;upstream\/development&#039;. Switched to a new branch &#039;resolve-team-conflict&#039; \u6b64\u6642\u53bbFork\u4e2d\u770b\u6703\u767c\u73fe\u8b8a\u6210 \u2714\ufe0fresolve-team-conflict \u63a5\u8457\u5efa\u7acbmr-member-b \u5206\u652f\u4e26\u628a\u6b63\u5728MR\u7684B\u540c\u5b78\u62c9\u5230 mr-member-b \u5206\u652f git fetch upstream merge-requests\/\/head:mr-member-b MR ID\u70baGitLab\u4e0a\uff0c\u8a72\u7b46MR\u5de6\u4e0b\u89d2\u7684\u6578\u5b57 PS C:\\git\\git-practice1&gt; git fetch upstream merge-requests\/4\/head:mr-member-b remote: Enumerating objects: 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\":\"BlogPosting\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#blogposting\",\"name\":\"GIT: \\u5408\\u4f75\\u885d\\u7a81-\\u5169\\u4eba\\u540c\\u6642\\u4fee\\u6539\\u540c\\u4e00\\u6a94\\u6848 - HyC Wiki\",\"headline\":\"GIT: \\u5408\\u4f75\\u885d\\u7a81-\\u5169\\u4eba\\u540c\\u6642\\u4fee\\u6539\\u540c\\u4e00\\u6a94\\u6848\",\"author\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/author\\\/hychen\\\/#author\"},\"publisher\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/#person\"},\"image\":{\"@type\":\"ImageObject\",\"url\":\"https:\\\/\\\/i0.wp.com\\\/hyc.eshachem.com\\\/program\\\/wp-content\\\/uploads\\\/2026\\\/04\\\/image.png?fit=874%2C521&amp;ssl=1\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#articleImage\"},\"datePublished\":\"2026-04-14T12:57:51+00:00\",\"dateModified\":\"2026-05-03T09:54:46+00:00\",\"inLanguage\":\"en-US\",\"mainEntityOfPage\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#webpage\"},\"isPartOf\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#webpage\"},\"articleSection\":\"Git\"},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#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\\\/category\\\/git\\\/#listItem\",\"name\":\"Git\"}},{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/category\\\/git\\\/#listItem\",\"position\":2,\"name\":\"Git\",\"item\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/category\\\/git\\\/\",\"nextItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#listItem\",\"name\":\"GIT: \\u5408\\u4f75\\u885d\\u7a81-\\u5169\\u4eba\\u540c\\u6642\\u4fee\\u6539\\u540c\\u4e00\\u6a94\\u6848\"},\"previousItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program#listItem\",\"name\":\"Home\"}},{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#listItem\",\"position\":3,\"name\":\"GIT: \\u5408\\u4f75\\u885d\\u7a81-\\u5169\\u4eba\\u540c\\u6642\\u4fee\\u6539\\u540c\\u4e00\\u6a94\\u6848\",\"previousItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/category\\\/git\\\/#listItem\",\"name\":\"Git\"}}]},{\"@type\":\"Person\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/#person\",\"name\":\"H.Y. Chen\",\"image\":{\"@type\":\"ImageObject\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#personImage\",\"url\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/fc6e05e080c9ea570267ee9ed68c8b1841d745cee07c0331c5440646e0646603?s=96&d=mm&r=g\",\"width\":96,\"height\":96,\"caption\":\"H.Y. Chen\"}},{\"@type\":\"Person\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/author\\\/hychen\\\/#author\",\"url\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/author\\\/hychen\\\/\",\"name\":\"H.Y. Chen\",\"image\":{\"@type\":\"ImageObject\",\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#authorImage\",\"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\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#webpage\",\"url\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/\",\"name\":\"GIT: \\u5408\\u4f75\\u885d\\u7a81-\\u5169\\u4eba\\u540c\\u6642\\u4fee\\u6539\\u540c\\u4e00\\u6a94\\u6848 - HyC Wiki\",\"description\":\"\\u5982\\u679cA\\u3001B\\u5169\\u500b\\u4eba\\u90fd\\u5728\\u4fee\\u6539\\u540c\\u4e00\\u500b\\u6a94\\u6848\\uff0c\\u5728A\\u540c\\u5b78Merge\\u5f8cB\\u540c\\u5b78\\u7684Merge\\u5c31\\u6703\\u51fa\\u73fe\\u554f\\u984c\\u4e86\\uff0c\\u9019\\u6642\\u6211\\u5011\\u53ef\\u4ee5\\u5feb\\u901f\\u7684\\u5728VSCode\\u4e0a\\u89e3\\u6c7a: \\u7576\\u540c\\u5b78A\\u3001B\\u5169\\u500b\\u90fd\\u4fee\\u6539\\u4e86\\u540c\\u4e00\\u500b\\u6a94\\u6848\\uff0c\\u4e14\\u9047\\u5230\\u90fd\\u6709\\u4fee\\u6539\\u5230\\u540c\\u4e00\\u884c\\u7684\\u60c5\\u6cc1\\u6642\\uff0c\\u7576\\u540c\\u5b78A\\u5148Merged\\u5f8c\\u540c\\u5b78B\\u7684Merge Request\\u5c31\\u6703\\u51fa\\u73fe\\u4e0b\\u9762\\u7684\\u932f\\u8aa4\\uff0c\\u986f\\u793a\\u5408\\u4f75\\u885d\\u7a81\\u9700\\u8981\\u88ab\\u89e3\\u6c7a \\u89e3\\u6cd5\\u662f\\u53e6\\u5916\\u5275\\u5efa\\u4e00\\u689d\\u81e8\\u6642\\u5206\\u652f\\uff0c\\u4e26\\u5c07\\u540c\\u5b78A\\u3001B\\u7684\\u885d\\u7a81\\u5728\\u9019\\u500b\\u5206\\u652f\\u89e3\\u6c7a\\u5f8c\\uff0c\\u5c07\\u9019\\u500b\\u81e8\\u6642\\u5206\\u652f\\u8207upstream\\\/development\\u5408\\u4f75 \\u89e3\\u6c7a\\u885d\\u7a81 \\u5efa\\u7acb\\u81e8\\u6642\\u5206\\u652f \\u5728VSCode\\u4e2d\\u6253\\u958b\\u5c08\\u6848\\u5f8c\\u5275\\u5efa\\u4e00\\u689d\\u81e8\\u6642\\u5206\\u652f git checkout -b resolve-team-conflict upstream\\\/development \\u7cfb\\u7d71\\u6703\\u56de\\u50b3\\u5275\\u5efa\\u6210\\u529f\\u4e26\\u4e14\\u5c07\\u4f60\\u8f49\\u79fb\\u81f3\\u8a72\\u81e8\\u6642\\u5206\\u652f(resolve-team-conflict)\\u4e0a: PS C:\\\\git\\\\git-practice1> git checkout -b resolve-team-conflict upstream\\\/development branch 'resolve-team-conflict' set up to track 'upstream\\\/development'. Switched to a new branch 'resolve-team-conflict' \\u6b64\\u6642\\u53bbFork\\u4e2d\\u770b\\u6703\\u767c\\u73fe\\u8b8a\\u6210 \\u2714\\ufe0fresolve-team-conflict \\u63a5\\u8457\\u5efa\\u7acbmr-member-b \\u5206\\u652f\\u4e26\\u628a\\u6b63\\u5728MR\\u7684B\\u540c\\u5b78\\u62c9\\u5230 mr-member-b \\u5206\\u652f git fetch upstream merge-requests\\\/\\\/head:mr-member-b MR ID\\u70baGitLab\\u4e0a\\uff0c\\u8a72\\u7b46MR\\u5de6\\u4e0b\\u89d2\\u7684\\u6578\\u5b57 PS C:\\\\git\\\\git-practice1> git fetch upstream merge-requests\\\/4\\\/head:mr-member-b remote: Enumerating objects: 3,\",\"inLanguage\":\"en-US\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/#website\"},\"breadcrumb\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\\\/#breadcrumblist\"},\"author\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/author\\\/hychen\\\/#author\"},\"creator\":{\"@id\":\"https:\\\/\\\/hyc.eshachem.com\\\/program\\\/author\\\/hychen\\\/#author\"},\"datePublished\":\"2026-04-14T12:57:51+00:00\",\"dateModified\":\"2026-05-03T09:54:46+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":"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848 - HyC Wiki","description":"\u5982\u679cA\u3001B\u5169\u500b\u4eba\u90fd\u5728\u4fee\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5728A\u540c\u5b78Merge\u5f8cB\u540c\u5b78\u7684Merge\u5c31\u6703\u51fa\u73fe\u554f\u984c\u4e86\uff0c\u9019\u6642\u6211\u5011\u53ef\u4ee5\u5feb\u901f\u7684\u5728VSCode\u4e0a\u89e3\u6c7a: \u7576\u540c\u5b78A\u3001B\u5169\u500b\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4e14\u9047\u5230\u90fd\u6709\u4fee\u6539\u5230\u540c\u4e00\u884c\u7684\u60c5\u6cc1\u6642\uff0c\u7576\u540c\u5b78A\u5148Merged\u5f8c\u540c\u5b78B\u7684Merge Request\u5c31\u6703\u51fa\u73fe\u4e0b\u9762\u7684\u932f\u8aa4\uff0c\u986f\u793a\u5408\u4f75\u885d\u7a81\u9700\u8981\u88ab\u89e3\u6c7a \u89e3\u6cd5\u662f\u53e6\u5916\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f\uff0c\u4e26\u5c07\u540c\u5b78A\u3001B\u7684\u885d\u7a81\u5728\u9019\u500b\u5206\u652f\u89e3\u6c7a\u5f8c\uff0c\u5c07\u9019\u500b\u81e8\u6642\u5206\u652f\u8207upstream\/development\u5408\u4f75 \u89e3\u6c7a\u885d\u7a81 \u5efa\u7acb\u81e8\u6642\u5206\u652f \u5728VSCode\u4e2d\u6253\u958b\u5c08\u6848\u5f8c\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f git checkout -b resolve-team-conflict upstream\/development \u7cfb\u7d71\u6703\u56de\u50b3\u5275\u5efa\u6210\u529f\u4e26\u4e14\u5c07\u4f60\u8f49\u79fb\u81f3\u8a72\u81e8\u6642\u5206\u652f(resolve-team-conflict)\u4e0a: PS C:\\git\\git-practice1> git checkout -b resolve-team-conflict upstream\/development branch 'resolve-team-conflict' set up to track 'upstream\/development'. Switched to a new branch 'resolve-team-conflict' \u6b64\u6642\u53bbFork\u4e2d\u770b\u6703\u767c\u73fe\u8b8a\u6210 \u2714\ufe0fresolve-team-conflict \u63a5\u8457\u5efa\u7acbmr-member-b \u5206\u652f\u4e26\u628a\u6b63\u5728MR\u7684B\u540c\u5b78\u62c9\u5230 mr-member-b \u5206\u652f git fetch upstream merge-requests\/\/head:mr-member-b MR ID\u70baGitLab\u4e0a\uff0c\u8a72\u7b46MR\u5de6\u4e0b\u89d2\u7684\u6578\u5b57 PS C:\\git\\git-practice1> git fetch upstream merge-requests\/4\/head:mr-member-b remote: Enumerating objects: 3,","canonical_url":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/","robots":"max-image-preview:large","keywords":"","webmasterTools":{"google-site-verification":"-324YR5tomynX5FeTW2lTMHIX0KmPBvpxjXpOhXwi1Q","miscellaneous":""},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"BlogPosting","@id":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#blogposting","name":"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848 - HyC Wiki","headline":"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848","author":{"@id":"https:\/\/hyc.eshachem.com\/program\/author\/hychen\/#author"},"publisher":{"@id":"https:\/\/hyc.eshachem.com\/program\/#person"},"image":{"@type":"ImageObject","url":"https:\/\/i0.wp.com\/hyc.eshachem.com\/program\/wp-content\/uploads\/2026\/04\/image.png?fit=874%2C521&amp;ssl=1","@id":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#articleImage"},"datePublished":"2026-04-14T12:57:51+00:00","dateModified":"2026-05-03T09:54:46+00:00","inLanguage":"en-US","mainEntityOfPage":{"@id":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#webpage"},"isPartOf":{"@id":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#webpage"},"articleSection":"Git"},{"@type":"BreadcrumbList","@id":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#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\/category\/git\/#listItem","name":"Git"}},{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program\/category\/git\/#listItem","position":2,"name":"Git","item":"https:\/\/hyc.eshachem.com\/program\/category\/git\/","nextItem":{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#listItem","name":"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848"},"previousItem":{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program#listItem","name":"Home"}},{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#listItem","position":3,"name":"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848","previousItem":{"@type":"ListItem","@id":"https:\/\/hyc.eshachem.com\/program\/category\/git\/#listItem","name":"Git"}}]},{"@type":"Person","@id":"https:\/\/hyc.eshachem.com\/program\/#person","name":"H.Y. Chen","image":{"@type":"ImageObject","@id":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#personImage","url":"https:\/\/secure.gravatar.com\/avatar\/fc6e05e080c9ea570267ee9ed68c8b1841d745cee07c0331c5440646e0646603?s=96&d=mm&r=g","width":96,"height":96,"caption":"H.Y. Chen"}},{"@type":"Person","@id":"https:\/\/hyc.eshachem.com\/program\/author\/hychen\/#author","url":"https:\/\/hyc.eshachem.com\/program\/author\/hychen\/","name":"H.Y. Chen","image":{"@type":"ImageObject","@id":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#authorImage","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\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#webpage","url":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/","name":"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848 - HyC Wiki","description":"\u5982\u679cA\u3001B\u5169\u500b\u4eba\u90fd\u5728\u4fee\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5728A\u540c\u5b78Merge\u5f8cB\u540c\u5b78\u7684Merge\u5c31\u6703\u51fa\u73fe\u554f\u984c\u4e86\uff0c\u9019\u6642\u6211\u5011\u53ef\u4ee5\u5feb\u901f\u7684\u5728VSCode\u4e0a\u89e3\u6c7a: \u7576\u540c\u5b78A\u3001B\u5169\u500b\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4e14\u9047\u5230\u90fd\u6709\u4fee\u6539\u5230\u540c\u4e00\u884c\u7684\u60c5\u6cc1\u6642\uff0c\u7576\u540c\u5b78A\u5148Merged\u5f8c\u540c\u5b78B\u7684Merge Request\u5c31\u6703\u51fa\u73fe\u4e0b\u9762\u7684\u932f\u8aa4\uff0c\u986f\u793a\u5408\u4f75\u885d\u7a81\u9700\u8981\u88ab\u89e3\u6c7a \u89e3\u6cd5\u662f\u53e6\u5916\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f\uff0c\u4e26\u5c07\u540c\u5b78A\u3001B\u7684\u885d\u7a81\u5728\u9019\u500b\u5206\u652f\u89e3\u6c7a\u5f8c\uff0c\u5c07\u9019\u500b\u81e8\u6642\u5206\u652f\u8207upstream\/development\u5408\u4f75 \u89e3\u6c7a\u885d\u7a81 \u5efa\u7acb\u81e8\u6642\u5206\u652f \u5728VSCode\u4e2d\u6253\u958b\u5c08\u6848\u5f8c\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f git checkout -b resolve-team-conflict upstream\/development \u7cfb\u7d71\u6703\u56de\u50b3\u5275\u5efa\u6210\u529f\u4e26\u4e14\u5c07\u4f60\u8f49\u79fb\u81f3\u8a72\u81e8\u6642\u5206\u652f(resolve-team-conflict)\u4e0a: PS C:\\git\\git-practice1> git checkout -b resolve-team-conflict upstream\/development branch 'resolve-team-conflict' set up to track 'upstream\/development'. Switched to a new branch 'resolve-team-conflict' \u6b64\u6642\u53bbFork\u4e2d\u770b\u6703\u767c\u73fe\u8b8a\u6210 \u2714\ufe0fresolve-team-conflict \u63a5\u8457\u5efa\u7acbmr-member-b \u5206\u652f\u4e26\u628a\u6b63\u5728MR\u7684B\u540c\u5b78\u62c9\u5230 mr-member-b \u5206\u652f git fetch upstream merge-requests\/\/head:mr-member-b MR ID\u70baGitLab\u4e0a\uff0c\u8a72\u7b46MR\u5de6\u4e0b\u89d2\u7684\u6578\u5b57 PS C:\\git\\git-practice1> git fetch upstream merge-requests\/4\/head:mr-member-b remote: Enumerating objects: 3,","inLanguage":"en-US","isPartOf":{"@id":"https:\/\/hyc.eshachem.com\/program\/#website"},"breadcrumb":{"@id":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/#breadcrumblist"},"author":{"@id":"https:\/\/hyc.eshachem.com\/program\/author\/hychen\/#author"},"creator":{"@id":"https:\/\/hyc.eshachem.com\/program\/author\/hychen\/#author"},"datePublished":"2026-04-14T12:57:51+00:00","dateModified":"2026-05-03T09:54:46+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":"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848 - HyC Wiki","og:description":"\u5982\u679cA\u3001B\u5169\u500b\u4eba\u90fd\u5728\u4fee\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5728A\u540c\u5b78Merge\u5f8cB\u540c\u5b78\u7684Merge\u5c31\u6703\u51fa\u73fe\u554f\u984c\u4e86\uff0c\u9019\u6642\u6211\u5011\u53ef\u4ee5\u5feb\u901f\u7684\u5728VSCode\u4e0a\u89e3\u6c7a: \u7576\u540c\u5b78A\u3001B\u5169\u500b\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4e14\u9047\u5230\u90fd\u6709\u4fee\u6539\u5230\u540c\u4e00\u884c\u7684\u60c5\u6cc1\u6642\uff0c\u7576\u540c\u5b78A\u5148Merged\u5f8c\u540c\u5b78B\u7684Merge Request\u5c31\u6703\u51fa\u73fe\u4e0b\u9762\u7684\u932f\u8aa4\uff0c\u986f\u793a\u5408\u4f75\u885d\u7a81\u9700\u8981\u88ab\u89e3\u6c7a \u89e3\u6cd5\u662f\u53e6\u5916\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f\uff0c\u4e26\u5c07\u540c\u5b78A\u3001B\u7684\u885d\u7a81\u5728\u9019\u500b\u5206\u652f\u89e3\u6c7a\u5f8c\uff0c\u5c07\u9019\u500b\u81e8\u6642\u5206\u652f\u8207upstream\/development\u5408\u4f75 \u89e3\u6c7a\u885d\u7a81 \u5efa\u7acb\u81e8\u6642\u5206\u652f \u5728VSCode\u4e2d\u6253\u958b\u5c08\u6848\u5f8c\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f git checkout -b resolve-team-conflict upstream\/development \u7cfb\u7d71\u6703\u56de\u50b3\u5275\u5efa\u6210\u529f\u4e26\u4e14\u5c07\u4f60\u8f49\u79fb\u81f3\u8a72\u81e8\u6642\u5206\u652f(resolve-team-conflict)\u4e0a: PS C:\\git\\git-practice1&gt; git checkout -b resolve-team-conflict upstream\/development branch 'resolve-team-conflict' set up to track 'upstream\/development'. Switched to a new branch 'resolve-team-conflict' \u6b64\u6642\u53bbFork\u4e2d\u770b\u6703\u767c\u73fe\u8b8a\u6210 \u2714\ufe0fresolve-team-conflict \u63a5\u8457\u5efa\u7acbmr-member-b \u5206\u652f\u4e26\u628a\u6b63\u5728MR\u7684B\u540c\u5b78\u62c9\u5230 mr-member-b \u5206\u652f git fetch upstream merge-requests\/\/head:mr-member-b MR ID\u70baGitLab\u4e0a\uff0c\u8a72\u7b46MR\u5de6\u4e0b\u89d2\u7684\u6578\u5b57 PS C:\\git\\git-practice1&gt; git fetch upstream merge-requests\/4\/head:mr-member-b remote: Enumerating objects: 3,","og:url":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/","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-04-14T12:57:51+00:00","article:modified_time":"2026-05-03T09:54:46+00:00","twitter:card":"summary_large_image","twitter:title":"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848 - HyC Wiki","twitter:description":"\u5982\u679cA\u3001B\u5169\u500b\u4eba\u90fd\u5728\u4fee\u6539\u540c\u4e00\u500b\u6a94\u6848\uff0c\u5728A\u540c\u5b78Merge\u5f8cB\u540c\u5b78\u7684Merge\u5c31\u6703\u51fa\u73fe\u554f\u984c\u4e86\uff0c\u9019\u6642\u6211\u5011\u53ef\u4ee5\u5feb\u901f\u7684\u5728VSCode\u4e0a\u89e3\u6c7a: \u7576\u540c\u5b78A\u3001B\u5169\u500b\u90fd\u4fee\u6539\u4e86\u540c\u4e00\u500b\u6a94\u6848\uff0c\u4e14\u9047\u5230\u90fd\u6709\u4fee\u6539\u5230\u540c\u4e00\u884c\u7684\u60c5\u6cc1\u6642\uff0c\u7576\u540c\u5b78A\u5148Merged\u5f8c\u540c\u5b78B\u7684Merge Request\u5c31\u6703\u51fa\u73fe\u4e0b\u9762\u7684\u932f\u8aa4\uff0c\u986f\u793a\u5408\u4f75\u885d\u7a81\u9700\u8981\u88ab\u89e3\u6c7a \u89e3\u6cd5\u662f\u53e6\u5916\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f\uff0c\u4e26\u5c07\u540c\u5b78A\u3001B\u7684\u885d\u7a81\u5728\u9019\u500b\u5206\u652f\u89e3\u6c7a\u5f8c\uff0c\u5c07\u9019\u500b\u81e8\u6642\u5206\u652f\u8207upstream\/development\u5408\u4f75 \u89e3\u6c7a\u885d\u7a81 \u5efa\u7acb\u81e8\u6642\u5206\u652f \u5728VSCode\u4e2d\u6253\u958b\u5c08\u6848\u5f8c\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f git checkout -b resolve-team-conflict upstream\/development \u7cfb\u7d71\u6703\u56de\u50b3\u5275\u5efa\u6210\u529f\u4e26\u4e14\u5c07\u4f60\u8f49\u79fb\u81f3\u8a72\u81e8\u6642\u5206\u652f(resolve-team-conflict)\u4e0a: PS C:\\git\\git-practice1&gt; git checkout -b resolve-team-conflict upstream\/development branch 'resolve-team-conflict' set up to track 'upstream\/development'. Switched to a new branch 'resolve-team-conflict' \u6b64\u6642\u53bbFork\u4e2d\u770b\u6703\u767c\u73fe\u8b8a\u6210 \u2714\ufe0fresolve-team-conflict \u63a5\u8457\u5efa\u7acbmr-member-b \u5206\u652f\u4e26\u628a\u6b63\u5728MR\u7684B\u540c\u5b78\u62c9\u5230 mr-member-b \u5206\u652f git fetch upstream merge-requests\/\/head:mr-member-b MR ID\u70baGitLab\u4e0a\uff0c\u8a72\u7b46MR\u5de6\u4e0b\u89d2\u7684\u6578\u5b57 PS C:\\git\\git-practice1&gt; git fetch upstream merge-requests\/4\/head:mr-member-b remote: Enumerating objects: 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":"306","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:31:35","updated":"2026-07-28 14:31:35"},"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\/category\/git\/\" title=\"Git\">Git<\/a>\n\t\t<\/span><span class=\"aioseo-breadcrumb-separator\">&raquo;<\/span><span class=\"aioseo-breadcrumb\">\n\t\t\tGIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848\n\t\t<\/span><\/div>","aioseo_breadcrumb_json":[{"label":"Home","link":"https:\/\/hyc.eshachem.com\/program"},{"label":"Git","link":"https:\/\/hyc.eshachem.com\/program\/category\/git\/"},{"label":"GIT: \u5408\u4f75\u885d\u7a81-\u5169\u4eba\u540c\u6642\u4fee\u6539\u540c\u4e00\u6a94\u6848","link":"https:\/\/hyc.eshachem.com\/program\/git-%e5%90%88%e4%bd%b5%e8%a1%9d%e7%aa%81-%e5%85%a9%e4%ba%ba%e5%90%8c%e6%99%82%e4%bf%ae%e6%94%b9%e5%90%8c%e4%b8%80%e6%aa%94%e6%a1%88\/"}],"views":36,"_links":{"self":[{"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/posts\/306","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/types\/post"}],"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=306"}],"version-history":[{"count":3,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/posts\/306\/revisions"}],"predecessor-version":[{"id":316,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/posts\/306\/revisions\/316"}],"wp:attachment":[{"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/media?parent=306"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/categories?post=306"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/tags?post=306"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}