{"id":255,"date":"2026-03-08T14:03:09","date_gmt":"2026-03-08T14:03:09","guid":{"rendered":"https:\/\/hyc.eshachem.com\/program\/?p=255"},"modified":"2026-04-14T12:57:12","modified_gmt":"2026-04-14T12:57:12","slug":"git-%e5%bc%b7%e5%88%b6%e5%90%88%e4%bd%b5","status":"publish","type":"post","link":"https:\/\/hyc.eshachem.com\/program\/git-%e5%bc%b7%e5%88%b6%e5%90%88%e4%bd%b5\/","title":{"rendered":"GIT: \u672c\u5730\u5f37\u5236\u5408\u4f75\u5230upstream"},"content":{"rendered":"\n<p class=\"\">\u592a\u4e45\u6c92\u6709\u62c9\u6771\u897f\u4e0b\u4f86\u6642\uff0c\u5728gitlab\u8981merge Request\u6642\u6703\u9047\u5230\u5408\u4f75\u885d\u7a81\uff0c\u4f46\u5982\u679c\u4f60\u78ba\u5b9a\u4f60\u7684\u672c\u5730\u7248\u672c\u5c31\u662f\u6700\u65b0\u7684\u7248\u672c\uff0c\u8ddf\u5718\u968a\u6210\u54e1\u5546\u8a0e\u904e\u5f8c\u53ef\u4ee5\u76f4\u63a5\u57f7\u884c\u5f37\u5236\u5408\u4f75:<\/p>\n\n\n\n<p class=\"\">\u5728\u7d42\u7aef\u6a5f\u4e2dcd\u9032\u5165\u5c08\u6848\u8cc7\u6599\u593e\u7136\u5f8c\u8f38\u5165 <code>git remote -v<\/code> \u53ef\u4ee5\u6aa2\u8996\u7576\u524d\u5404\u500b\u5206\u652f\u7684\u6307\u5411\uff0c\u5728\u6a19\u6e96\u7684 Git \u5354\u4f5c\u6d41\u7a0b\u4e2d\uff1a<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li class=\"\"><strong><code>origin<\/code><\/strong>\uff1a\u61c9\u8a72\u6307\u5411\u4f60\u7684 <strong>\u500b\u4eba Fork<\/strong>\uff08<code>HarryChen1029\/cell-front-end<\/code>\uff09\u3002<\/li>\n\n\n\n<li class=\"\"><strong><code>upstream<\/code><\/strong>\uff1a\u61c9\u8a72\u6307\u5411 <strong>\u539f\u59cb\u5c08\u6848\u4e3b\u5009\u5eab<\/strong>\uff08\u901a\u5e38\u662f <code>birc-web\/cell-front-end<\/code> \u6216\u7d44\u7e54\u5e33\u865f\uff09\u3002<\/li>\n<\/ul>\n\n\n\n<p class=\"\">\u5982\u679c\u6709\u6307\u5411\u932f\u8aa4\uff0c\u53ef\u4ee5\u5148\u522a\u9664\u932f\u8aa4\u7684 upstream<\/p>\n\n\n\n<p class=\"\"><code>git remote remove {Wrong Branch}<\/code><\/p>\n\n\n\n<p class=\"\">\u518d\u63db\u6210\u771f\u6b63\u7684\u5c08\u6848\u4e3b\u8def\u5f91<\/p>\n\n\n\n<p class=\"\"><code>git remote add upstream https:\/\/gitlab.ntubimdbirc.tw\/{Project Name}.git<\/code><\/p>\n\n\n\n<h3 class=\"wp-block-heading\">\u7b2c\u4e00\u6b65\uff1a\u6e05\u7406\u4e26\u78ba\u8a8d\u672c\u5730\u72c0\u614b<\/h3>\n\n\n\n<p class=\"\">\u5148\u78ba\u4fdd\u4f60\u7684\u672c\u5730 <code>dev<\/code> \u5206\u652f\u662f\u6700\u4e7e\u6de8\u3001\u6700\u65b0\u7684\u72c0\u614b\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u78ba\u4fdd\u5728 dev \u5206\u652f\ngit checkout dev\n\n# (\u9078\u505a) \u5982\u679c\u4f60\u60f3\u653e\u68c4\u6240\u6709\u672c\u5730\u672a\u5b58\u6a94\u7684\u96dc\u4e82\u6539\u52d5 (.env \u7b49)\ngit restore .\n<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\">\u7b2c\u4e8c\u6b65\uff1a\u5c07\u4e3b\u5009\u5eab (Upstream) \u7684\u66f4\u65b0\u6293\u4e0b\u4f86\u89e3\u6c7a<\/h3>\n\n\n\n<p class=\"\">\u5373\u4f7f\u8981\u5f37\u5236\u5408\u4f75\uff0c\u6700\u597d\u7684\u505a\u6cd5\u9084\u662f\u5148\u8b93\u672c\u5730\u300c\u541e\u6389\u300d\u9060\u7aef\u7684\u66f4\u65b0\uff0c\u9019\u6a23\u53ef\u4ee5\u907f\u514d Pipeline \u57f7\u884c\u5931\u6557\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code># \u6293\u53d6\u4e3b\u5009\u5eab\u6700\u65b0\u52d5\u614b\ngit fetch upstream\n\n# \u5f37\u884c\u8b93\u672c\u5730 dev \u5438\u6536 upstream\/dev \u7684\u5167\u5bb9 (\u89e3\u6c7a\u885d\u7a81)\ngit merge upstream\/dev\n<\/code><\/pre>\n\n\n\n<ul class=\"wp-block-list\">\n<li class=\"\"><strong>\u82e5\u6709\u885d\u7a81<\/strong>\uff1a\u6253\u958b\u7de8\u8f2f\u5668\u5b58\u6a94\u4f60\u8981\u7684\u7a0b\u5f0f\u78bc\uff0c\u7136\u5f8c\u57f7\u884c\uff1aBash<code>git add . git commit -m \"chore: \u89e3\u6c7a\u885d\u7a81\u4e26\u6e96\u5099\u5f37\u5236\u66f4\u65b0\"<\/code><\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\">\u7b2c\u4e09\u6b65\uff1a\u5f37\u5236\u63a8\u9001\u5230\u4e3b\u5009\u5eab (Upstream)<\/h3>\n\n\n\n<p class=\"\">\u9019\u662f\u6700\u95dc\u9375\u7684\u4e00\u6b65\uff0c\u76f4\u63a5\u7528\u4f60\u73fe\u5728\u9019\u53f0\u96fb\u8166\u7684\u5167\u5bb9\u300c\u6d17\u6389\u300d\u9060\u7aef <code>dev<\/code>\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git push upstream dev --force<\/code><\/pre>\n\n\n\n<p class=\"\">\u53ef\u4ee5\u57f7\u884c\u4ee5\u4e0b\u7a0b\u5f0f\u78bc\u9032\u884c\u78ba\u8a8d:<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git fetch upstream\ngit diff development upstream\/development<\/code><\/pre>\n\n\n\n<p class=\"\">\u82e5<code>git diff<\/code>&#8230; \u6c92\u6709\u986f\u793a\u6771\u897f\uff0c\u90a3\u5c31\u4ee3\u8868\u5408\u4f75\u6210\u529f\u4e86!<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u592a\u4e45\u6c92\u6709\u62c9\u6771\u897f\u4e0b\u4f86\u6642\uff0c\u5728gitlab\u8981merge Request\u6642\u6703\u9047\u5230\u5408\u4f75\u885d\u7a81\uff0c\u4f46\u5982\u679c\u4f60\u78ba\u5b9a\u4f60\u7684\u672c\u5730\u7248\u672c\u5c31\u662f\u6700\u65b0\u7684\u7248\u672c\uff0c\u8ddf\u5718\u968a\u6210\u54e1\u5546\u8a0e\u904e\u5f8c\u53ef\u4ee5\u76f4\u63a5\u57f7\u884c\u5f37\u5236\u5408\u4f75: \u5728\u7d42\u7aef\u6a5f\u4e2dcd\u9032\u5165\u5c08\u6848\u8cc7\u6599\u593e\u7136\u5f8c\u8f38\u5165 git remote -v \u53ef\u4ee5\u6aa2\u8996\u7576\u524d\u5404\u500b\u5206\u652f\u7684\u6307\u5411\uff0c\u5728\u6a19\u6e96\u7684 Git \u5354\u4f5c\u6d41\u7a0b\u4e2d\uff1a \u5982\u679c\u6709\u6307\u5411\u932f\u8aa4\uff0c\u53ef\u4ee5\u5148\u522a\u9664\u932f\u8aa4\u7684 [&hellip;]<\/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-255","post","type-post","status-publish","format-standard","hentry","category-git"],"_links":{"self":[{"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/posts\/255","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=255"}],"version-history":[{"count":2,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/posts\/255\/revisions"}],"predecessor-version":[{"id":304,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/posts\/255\/revisions\/304"}],"wp:attachment":[{"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/media?parent=255"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/categories?post=255"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/hyc.eshachem.com\/program\/wp-json\/wp\/v2\/tags?post=255"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}