{"id":438986,"date":"2021-04-11T11:32:25","date_gmt":"2021-04-11T03:32:25","guid":{"rendered":"http:\/\/4563.org\/?p=438986"},"modified":"2021-04-11T11:32:25","modified_gmt":"2021-04-11T03:32:25","slug":"git-%e9%97%ae%e9%a2%98%e6%b1%82%e5%90%84%e4%bd%8d%e8%80%81%e5%93%a5%e8%a7%a3","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=438986","title":{"rendered":"git \u95ee\u9898\u6c42\u5404\u4f4d\u8001\u54e5\u89e3"},"content":{"rendered":"
\n
\n
\n

git \u95ee\u9898\u6c42\u5404\u4f4d\u8001\u54e5\u89e3 <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : zmlq7 <\/span> <\/i> 0<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n

\u6709\u4e24\u4e2a\u5f85\u5f00\u53d1\u529f\u80fd a \u548c b\uff0c\u4e24\u4e2a\u4eba A \u548c B\uff0c A \u8d1f\u8d23 a\uff0cB \u8d1f\u8d23 b \u3002<\/p>\n

a \u5f00\u59cb\u548c b \u90fd\u5728 dev \u5206\u652f\u5f00\u53d1\uff0c\u7136\u540e\u88ab\u6307\u51fa a \u8981\u5355\u72ec\u7528\u5206\u652f\u5f00\u53d1\uff0c\u7136\u540e\u7b2c\u4e09\u4eba\u5265\u79bb\u4e86\u4e24\u4e2a\u529f\u80fd\u7684\u4ee3\u7801\uff0cA \u5728\u672c\u5730\u5f00\u4e86\u65b0 test \u5206\u652f\u7ee7\u7eed\u5f00\u53d1 a\uff0c\u540e\u7eed\u4e5f\u4ece test \u5206\u652f\u63d0\u4ea4\u6d4b\u8bd5\u4e0a\u7ebf\uff0cB \u7ee7\u7eed\u5728 dev \u5206\u652f\u5f00\u53d1 b\uff0cA \u5728\u5f00\u53d1\u4e86\u4e00\u6bb5\u65f6\u95f4\u540e\u5e94\u8be5\u662f\u53c8\u5408\u4e86\u4e00\u7248 dev \u5206\u652f\u7684\u4ee3\u7801\uff0c\u90e8\u5206\u516c\u5171\u6587\u4ef6\u89e3\u51b2\u7a81\u7684\u65f6\u5019\u5e94\u7528\u7684\u662f A \u672c\u5730\u7684\u4ee3\u7801\uff08 A \u7684\u672c\u5730\u4ee3\u7801\u662f\u8001\u7248\uff09\uff0cA \u73b0\u5728\u5df2\u7ecf\u628a a \u63d0\u4ea4\u5230\u7ebf\u4e0a\u7684 master \u5206\u652f\u3002\u73b0\u5728 B \u62c9\u53d6\u7ebf\u4e0a master \u7684\u4ee3\u7801\uff0c\u7531\u4e8e\u672c\u6765\u5e94\u8be5\u51b2\u7a81\u7684\u5730\u65b9\u4e4b\u524d\u88ab A \u89e3\u4e86\u51b2\u7a81\u5e76\u5e94\u7528\u4e86 a \u7684\u4ee3\u7801\uff0c\u4f46\u5b9e\u9645\u4e0a\u662f\u8981\u7528 B \u7684\u65b0\u4ee3\u7801\u3002\u73b0\u5728 B \u8981\u600e\u4e48\u5c3d\u91cf\u4fdd\u7559 A \u7684\u4ee3\u7801\uff0c\u5e76\u4e14\u628a B \u7684\u4ee3\u7801 merge \u8fdb master \u5462\u3002<\/p>\n

\u7b80\u8ff0\u5c31\u662f\uff1a\u90e8\u5206\u6587\u4ef6\u5e94\u8be5\u7528 B \u7684\u65b0\u7684\uff0c\u4f46\u662f A \u5df2\u7ecf\u89e3\u51b2\u7a81\u7528\u4e86\u8001\u7684\u5e76\u63a8\u5230\u4e86\u7ebf\u4e0a\uff0c\u73b0\u5728 B merge master \u5206\u652f\uff0c\u660e\u660e\u4e0d\u4e00\u6837\u7684\u5730\u65b9\uff0c\u4f46\u662f\u56e0\u4e3a A \u5df2\u7ecf\u89e3\u8fc7\uff0c\u6240\u4ee5\u76f4\u63a5\u5c31\u7528\u4e86 A \u7684\u89e3\u51b3\u65b9\u6848\u3002\u73b0\u5728 B \u5e0c\u671b merge master \u5206\u652f\u5230\u672c\u5730 dev \u5206\u652f\uff0c\u6709\u4ee3\u7801\u4e0d\u540c\u7684\u5730\u65b9 git \u90fd\u80fd\u63d0\u793a\u51fa\u6765\uff0c\u89e3\u597d\u540e\u8be5\u8c01\u8981\u6539\u5c31\u8c01\u6539\u3002<\/p>\n

\u8fd9\u79cd\u60c5\u51b5\u867d\u7136\u90fd\u4e0d\u60f3\u770b\u5230\uff0c\u4f46\u662f\u53d1\u751f\u4e86\uff0c\u53ea\u5e0c\u671b\u597d\u597d\u89e3\u51b3\u5c31\u597d\u3002\u5e0c\u671b\u770b\u5230\u7684\u8001\u54e5\u80fd\u7ed9\u4e2a\u597d\u7684\u89e3\u3002\u5509\u3002<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (5<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : christin <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u63d0\u4f9b\u4e00\u4e2a\u601d\u8def \u6ca1\u6709\u4efb\u4f55\u5b9e\u9645\u64cd\u4f5c\u7ecf\u9a8c
    B \u62c9 master \u56de\u9000\u7248\u672c\u5230 A \u63d0\u4ea4\u4e4b\u524d \u628a dev merge \u8fdb master \u518d\u63d0\u4ea4\u4e0a\u53bb A \u518d\u62c9\u53d6 merge <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : zmlq7 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @christin \u611f\u89c9\u6709\u70b9\u95ee\u9898\u3002\u672c\u6765\u662f A \u548c B \u5b8c\u6210\u529f\u80fd\u540e\u7684\u5206\u652f\u5408\u5e76\uff0cmaster \u53ea\u662f\u4e00\u4e2a\u7ed3\u679c\u5206\u652f\uff0c\u5ffd\u7565\u6389 master \u5206\u652f\u3002A \u5728\u4e2d\u9014 merge B\uff0c\u5047\u8bbe\u5f53\u65f6 B \u7684 \u5386\u53f2\u8282\u70b9\u4e3a H1\uff0c\u4e5f\u5c31\u610f\u5473 H1 \u4e4b\u524d\u7684\u4ee3\u7801\u5408\u5e76\u90fd\u6309\u7167 A \u7684\u6765\uff0c\u7b49 ab \u7684\u529f\u80fd\u90fd\u5b8c\u6210\u540e A \u548c B \u6765 merge\uff0c\u53d1\u73b0 A \u5728 H1 \u8282\u70b9\u6709\u8fc7\u5408\u5e76\uff0c\u90a3 H1 \u4e4b\u540e\u7684\u53ef\u80fd\u662f\u8981\u89e3\u51b2\u7a81\uff0c\u4f46 H1 \u53ca\u4e4b\u524d\u7684\u51b2\u7a81\u70b9\u8fd8\u662f\u4f1a\u6309\u7167 A \u4e4b\u524d\u7684\u89e3\u51b3\u5427\u3002\u660e\u5929\u4f1a\u8bd5\u4e00\u4e0b\uff0c\u8c22\u8c22\u89e3\u7b54\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : msg7086 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u9996\u5148\u8981\u786e\u5b9a\u7684\u662f\uff0cdev \u6216 master \u4e0a\u662f\u4e0d\u662f\u53ea\u5305\u542b A \u7684\u4ee3\u7801\uff0c\u5e76\u4e14\u4e0d\u5305\u542b B \u7684\u4ee3\u7801\uff1f<\/p>\n

    \u5982\u679c\u662f\uff0c\u90a3\u8bf4\u660e\u73b0\u5728\u7684\u72b6\u6001\u662f\u6b63\u786e\u7684\uff0cB \u9700\u8981 rebase \u5230 A \u7684\u6210\u54c1\u4e0a\uff0c\u7136\u540e\u81ea\u884c\u5904\u7406\u51b2\u7a81\uff0c\u7136\u540e\u518d\u5408\u5e76\u56de\u4e3b\u5e72\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : towry <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : pkoukk <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    master \u56de\u9000\u56de\u53bb\uff0c\u7136\u540e\u4ece master \u7b7e\u51fa\u4e00\u4e2a\u65b0\u5206\u652f\uff0c\u4ece A \u548c B \u7684\u5206\u652f cherry pick\uff0c\u6700\u540e\u63d0\u4ea4\u56de master
    \u4e0d\u8fc7\u95ee\u9898\u5728\u4e8e\u5982\u679c A \u548c B \u7684 commit \u7c92\u5ea6\u4e0d\u5927\u5408\u7406\uff0c\u641e\u8d77\u6765\u5c31\u5f88\u96be\u53d7 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    git \u95ee\u9898\u6c42\u5404\u4f4d\u8001\u54e5\u89e3 \u8cc7\u6df1\u5927\u4f6c…<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[],"tags":[],"_links":{"self":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/438986"}],"collection":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=438986"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/438986\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=438986"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=438986"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=438986"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}