{"id":161961,"date":"2020-09-27T03:22:44","date_gmt":"2020-09-26T19:22:44","guid":{"rendered":"http:\/\/4563.org\/?p=161961"},"modified":"2020-09-27T03:22:44","modified_gmt":"2020-09-26T19:22:44","slug":"%e5%b0%8f%e7%99%bd%e6%8f%90%e9%97%ae%ef%bc%9a-git-%e5%9c%a8%e5%ae%9e%e9%99%85%e5%a4%9a%e4%ba%ba%e5%90%88%e4%bd%9c%e4%b8%ad%e6%98%af%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8%e7%9a%84%ef%bc%9f","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=161961","title":{"rendered":"\u5c0f\u767d\u63d0\u95ee\uff1a Git \u5728\u5b9e\u9645\u591a\u4eba\u5408\u4f5c\u4e2d\u662f\u5982\u4f55\u4f7f\u7528\u7684\uff1f"},"content":{"rendered":"
\n
\n
\n

\u5c0f\u767d\u63d0\u95ee\uff1a Git \u5728\u5b9e\u9645\u591a\u4eba\u5408\u4f5c\u4e2d\u662f\u5982\u4f55\u4f7f\u7528\u7684\uff1f <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : AerithLoveMe <\/span> <\/i> 2<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n

\u8bf7\u95ee\u4e00\u4e0b Git \u5728\u5b9e\u9645\u5de5\u4f5c\u4e2d\u662f\u5982\u4f55\u4f7f\u7528\u7684\uff1f\u662f\u7531\u4e00\u4e2a\u4eba\u521b\u7acb\u4ed3\u5e93\u5efa\u7acb\u57fa\u672c\u6a21\u5757\uff0c\u7136\u540e\u7ec4\u5458 clone \u4e0b\u6765\u5206\u522b\u5b8c\u6210\u4e48\uff1f\u8fd8\u662f\u5176\u4ed6\u7684\u65b9\u5f0f\uff1f\u6c42\u544a\u77e5\uff0c\u8c22\u8c22\uff01<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (10<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : jadehare <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u64cd\u4f5c\u5206\u652f\uff0c\u6709\u4e00\u4e2a\u4e3b\u5206\u652f\uff0c\u5176\u4ed6\u4eba\u4ece\u8fd9\u4e2a\u4e3b\u5206\u652f\u5207\u5206\u652f\uff0c\u6539\u5b8c\u540e\u518d\u548c\u56de\u5230\u4e3b\u5206\u652f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : shuax <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git flow \u4e86\u89e3\u4e00\u4e0b <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : TuringGunner <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6709\u4e00\u4e2a master \u5206\u652f\uff0c\u5176\u4ed6\u4eba fork \u4e00\u4e2a\u81ea\u5df1\u7684\uff0c\u5f00\u53d1\uff0c\u5f80 master \u63d0 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : itskingname <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6709\u51e0\u4e2a\u57fa\u672c\u539f\u5219\uff1a
    1. master \u5206\u652f\u4e0d\u80fd\u76f4\u63a5\u4fee\u6539\u4ee3\u7801\u3002\u4ed6\u91cc\u9762\u7684\u4ee3\u7801\u53d8\u52a8\u53ea\u80fd\u901a\u8fc7 merge \u5f15\u5165
    2. \u8981\u589e\u52a0\u65b0\u529f\u80fd\u6216\u8005\u4fee\u6539 bug \u65f6\u3002\u5148\u628a\u672c\u5730\u7684 master \u5206\u652f\u66f4\u65b0\u5230\u6700\u65b0\u3002\u7136\u540e\u57fa\u4e8e\u5b83\u521b\u5efa\u4e00\u4e2a\u5f00\u53d1\u5206\u652f dev
    3. \u5728\u5f00\u53d1\u5206\u652f dev \u4fee\u6539\u4ee3\u7801\u3002
    4. \u5148\u628a dev \u5206\u652f\u7684\u4ee3\u7801 commit \u3002\u4f46\u4e0d\u8981 push
    5. \u5207\u6362\u56de master \u5206\u652f\uff0cgit pull \u66f4\u65b0\u5230\u6700\u65b0
    6. \u5207\u6362\u5230 dev \u5206\u652f\uff0c\u628a master \u5206\u652f merge \u5230 dev \u5206\u652f\u3002\u5982\u679c\u6709\u51b2\u7a81\uff0c\u5c31\u89e3\u51b3\u51b2\u7a81\uff0c\u7136\u540e\u7ee7\u7eed commit \u3002\u5982\u679c\u6ca1\u6709\u51b2\u7a81\uff0c\u8fdb\u5165\u7b2c 7 \u6b65\u3002
    7. \u5207\u6362\u5230 master \u5206\u652f\uff0c\u628a dev \u5206\u652f merge \u8fdb\u6765\u3002\u7b2c 7\uff0c8 \u6b65\u7684\u65f6\u95f4\u95f4\u9694\u4e00\u5b9a\u8981\u77ed\u3002\u6b63\u5e38\u60c5\u51b5\u4e0b\uff0c\u8fd9\u4e00\u6b65\u4e00\u5b9a\u4f1a\u6210\u529f\u3002
    8. \u63d0\u4ea4 master \u5206\u652f\u5230\u8fdc\u7a0b\u7684 master \u5206\u652f\u3002\u5b8c\u6210\u3002<\/p>\n

    \u5982\u679c\u56e2\u961f\u6709\u6301\u7eed\u96c6\u6210\u7684\u6d41\u7a0b\u3002\u90a3\u4e48\u7b2c 8 \u8865\u662f\u63d0\u4ea4\u5230\u6301\u7eed\u96c6\u6210\u4e13\u7528\u7684\u5206\u652f\uff0cCI \u7cfb\u7edf\u4f1a\u81ea\u52a8\u53d1\u8d77 code review \u7ed9\u76f8\u5173\u7684\u4eba\u3002\u4ed6\u4eec\u5ba1\u67e5\u5b8c\u6bd5\u901a\u8fc7\u4ee5\u540e\uff0cCI \u7cfb\u7edf\u81ea\u52a8\u628a\u4ee3\u7801\u5408\u5e76\u8fdb\u5165\u771f\u6b63\u7684\u8fdc\u7a0b master \u5206\u652f\u3002\u7136\u540e\u81ea\u52a8\u90e8\u7f72\u4e0a\u7ebf\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : AerithLoveMe <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @itskingname \u5927\u6982\u4e86\u89e3\u4e86 \u8c22\u8c22 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : zxCoder <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5982\u679c\u7b2c 7 \u6b65\u7684\u65f6\u5019\uff0cmaster \u5206\u652f\u53c8\u88ab\u4eba\u6539\u4e86\uff0c\u662f\u4e0d\u662f\u5c31\u5f97\u91cd\u65b0\u8fdb\u884c 5-7 \u6b65\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : volvo007 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u56e0\u4e3a\u81ea\u5df1\u662f\u91ce\u8def\u5b50\u51fa\u5bb6\uff0c\u6240\u4ee5\u8fd8\u771f\u4e0d\u6e05\u695a\uff0c\u8c22\u8c22 #4 \u7684\u8001\u54e5<\/p>\n

    \u6240\u4ee5\u5173\u952e\u5c31\u662f\u81ea\u5df1\u7684\u4fee\u6539\u5148 commit\uff0c\u522b\u6025\u7740 push \uff1b master \u518d pull \u4e00\u6b21\u540c\u6b65\u5e76\u89e3\u51b3\u548c dev \u51b2\u7a81\u4e4b\u540e\uff0c\u518d\u628a dev merge \u5230\u672c\u5730\u7684 master \u518d\u63d0\u4ea4\u3002\u4e86\u89e3\u4e86<\/p>\n

    \u5982\u679c\u8fd9\u4e2a\u65f6\u5019\uff0c\u4e0d\u5de7\u8fdc\u7a0b\u7684 master \u771f\u7684\u88ab\u4eba\u4fee\u6539\u4e86\uff0c\u90a3\u770b\u8d77\u6765\u518d\u4ece 5. \u5f00\u59cb\u505a\u4e00\u6b21\u5c31\u884c\u4e86 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : zxCoder <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @itskingname
    \u5982\u679c\u7b2c 7 \u6b65\u7684\u65f6\u5019\uff0cmaster \u5206\u652f\u53c8\u88ab\u4eba\u6539\u4e86\uff0c\u662f\u4e0d\u662f\u5c31\u5f97\u91cd\u65b0\u8fdb\u884c 5-7 \u6b65\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : dilu <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    #4 \u7684\u65b9\u6cd5\u662f checkout \u4e00\u4e2a\u65b0\u5206\u652f \u5e72\u5b8c\u4e86 merge \u5230 master \u5176\u5b9e\u4e5f\u53ef\u4ee5\u901a\u8fc7\u5e73\u53f0\u7684 merge request \u5408\u5e76\u5230 master \u4e0a<\/p>\n

    \u8fd9\u79cd\u7011\u5e03\u6d41\u7684\u5f00\u53d1\u5176\u5b9e\u8fd8\u6709\u4e00\u4e2a\u529e\u6cd5\u662f\uff0c\u672c\u5730 dev \u5f00\u53d1\u5b8c\u4e86 rebase \u4e00\u4e0b origin\/master \u7136\u540e push \u5982\u679c\u8ddf\u522b\u4eba\u534f\u540c\uff0cgit pull \u7684\u65f6\u5019\u53ef\u4ee5\u52a0\u4e0a–rebase \u8fd9\u6837\u51fa\u6765\u7684\u7ebf\u975e\u5e38\u6e05\u6670\u660e\u4e86<\/p>\n

    \u8fd8\u6709\u4e00\u79cd\u654f\u6377\u5f00\u53d1\u7684\u65b9\u5f0f\uff0c\u591a\u4eba\u540c\u65f6\u5728 dev \u5f00\u53d1\uff0c\u5b9a\u65f6\u4ece dev \u5408\u5e76\u5230 test \u5206\u652f\uff0c\u6d4b\u8bd5\u5b8c\u6210\u540e\u5408\u5e76\u5230 master\uff0c\u518d\u5b9a\u671f\u6253 tag \u6216\u8005\u53d1\u5e03 release \u5206\u652f <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : itskingname <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @zxCoder \u662f\u7684\uff0c\u6240\u4ee5\u7b2c 6\uff0c7 \u6b65\u7684\u95f4\u9694\u65f6\u95f4\u8981\u77ed\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    \u5c0f\u767d\u63d0\u95ee\uff1a Git \u5728\u5b9e\u9645\u591a\u4eba\u5408\u4f5c…<\/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\/161961"}],"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=161961"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/161961\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=161961"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=161961"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=161961"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}