{"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

\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

\n\n\n\n

\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>\n\n\n\n
\n

\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

\u89e3\u6c7a\u885d\u7a81<\/h1>\n\n\n\n

\u5efa\u7acb\u81e8\u6642\u5206\u652f<\/h2>\n\n\n\n

\u5728VSCode\u4e2d\u6253\u958b\u5c08\u6848\u5f8c\u5275\u5efa\u4e00\u689d\u81e8\u6642\u5206\u652f<\/p>\n\n\n\n

git checkout -b resolve-team-conflict upstream\/development<\/code><\/p>\n\n\n\n

\u7cfb\u7d71\u6703\u56de\u50b3\u5275\u5efa\u6210\u529f\u4e26\u4e14\u5c07\u4f60\u8f49\u79fb\u81f3\u8a72\u81e8\u6642\u5206\u652f(resolve-team-conflict<\/code>)\u4e0a:<\/p>\n\n\n\n

PS C:\\git\\git-practice1> git checkout -b resolve-team-conflict upstream\/development\nbranch 'resolve-team-conflict' set up to track 'upstream\/development'.\nSwitched to a new branch 'resolve-team-conflict'<\/code><\/pre>\n\n\n\n
\u6b64\u6642\u53bbFork\u4e2d\u770b\u6703\u767c\u73fe\u8b8a\u6210 \u2714\ufe0fresolve-team-conflict<\/code><\/p>\n\n\n\n
\"\"<\/figure>\n\n\n\n
\u63a5\u8457\u5efa\u7acbmr-member-b<\/code> \u5206\u652f\u4e26\u628a\u6b63\u5728MR\u7684B\u540c\u5b78\u62c9\u5230 mr-member-b<\/code> \u5206\u652f<\/p>\n\n\n\n
git fetch upstream merge-requests\/<MR_ID>\/head:mr-member-b<\/code><\/p>\n\n\n\n
MR ID\u70baGitLab\u4e0a\uff0c\u8a72\u7b46MR\u5de6\u4e0b\u89d2\u7684\u6578\u5b57<\/p>\n\n\n\n
\"\"<\/figure>\n\n\n\n
PS C:\\git\\git-practice1> git fetch upstream merge-requests\/4\/head:mr-member-b\nremote: Enumerating objects: 3, done.\nremote: Counting objects: 100% (1\/1), done.\nremote: Total 3 (delta 1), reused 1 (delta 1), pack-reused 2 (from 1)\nUnpacking objects: 100% (3\/3), 300 bytes | 27.00 KiB\/s, done.\nFrom https:\/\/gitlab.com\/git-course11\/git-practice1\n* [new ref] refs\/merge-requests\/4\/head -> mr-member-b<\/code><\/pre>\n\n\n\n
\u5408\u4f75\u96d9\u65b9\u7a0b\u5f0f\u78bc<\/h2>\n\n\n\n
\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
git merge upstream\/development<\/code><\/p>\n\n\n\n
\u63a5\u8457\u6211\u5011\u518d\u628aB\u540c\u5b78\u7684\u5167\u5bb9merge\u9032resolve-team-conflict<\/code><\/p>\n\n\n\n
PS C:\\git\\git-practice1> git merge mr-member-b\nAuto-merging README.md\nCONFLICT (content): Merge conflict in README.md\nAutomatic merge failed; fix conflicts and then commit the result.<\/code><\/pre>\n\n\n\n
\u6b64\u6642VSCode\u5c31\u6703\u51fa\u73fe >>><\/code> , <<<<\/code> , ===<\/code> \u7b26\u865f<\/p>\n\n\n\n
\"\"<\/figure>\n\n\n\n
\u518d\u6839\u64da\u60c5\u6cc1\u9078\u64c7\u8981\u63a5\u53d7\u54ea\u7a2e\u8b8a\u66f4\u5373\u53ef!!<\/p>\n\n\n\n
\u7d50\u675f\u885d\u7a81<\/h1>\n\n\n\n
\u63a5\u8457\u8981\u5c07 resolve-team-conflict<\/code> \u5408\u4f75\u5230 upstream\/development<\/p>\n\n\n\n
# 1. \u544a\u8a34 Git \u9019\u500b\u6a94\u6848\u6211\u4fee\u597d\u4e86\nPS C:\\git\\git-practice1>  git add README.md    \n\n# 2. \u5b8c\u6210\u5408\u4f75\u63d0\u4ea4 (Commit)\nPS C:\\git\\git-practice1> git commit -m \"Merge: resolve README.md conflict between member A and B\"\n\ngit push origin resolve-team-conflict<\/code><\/pre>\n\n\n\n
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>\n\n\n\n
<\/p>\n","protected":false},"excerpt":{"rendered":"
\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 […]<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[40],"tags":[],"class_list":["post-306","post","type-post","status-publish","format-standard","hentry","category-git"],"_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}]}}