{"id":136096,"date":"2020-07-21T19:55:16","date_gmt":"2020-07-21T11:55:16","guid":{"rendered":"http:\/\/4563.org\/?p=136096"},"modified":"2020-07-21T19:55:16","modified_gmt":"2020-07-21T11:55:16","slug":"%e4%b8%ba%e5%bc%80%e6%ba%90%e9%a1%b9%e7%9b%ae%e8%b4%a1%e7%8c%ae%e4%bb%a3%e7%a0%81%e7%9a%84%e6%9c%80%e4%bd%b3%e5%ae%9e%e8%b7%b5%ef%bc%88%e6%9c%80%e8%b4%9f%e8%b4%a3%e4%bb%bb%ef%bc%9f%ef%bc%89%e6%98%af","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=136096","title":{"rendered":"\u4e3a\u5f00\u6e90\u9879\u76ee\u8d21\u732e\u4ee3\u7801\u7684\u6700\u4f73\u5b9e\u8df5\uff08\u6700\u8d1f\u8d23\u4efb\uff1f\uff09\u662f\u600e\u6837\u7684\uff1f"},"content":{"rendered":"
\n
\n
\n

\u4e3a\u5f00\u6e90\u9879\u76ee\u8d21\u732e\u4ee3\u7801\u7684\u6700\u4f73\u5b9e\u8df5\uff08\u6700\u8d1f\u8d23\u4efb\uff1f\uff09\u662f\u600e\u6837\u7684\uff1f <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : tlerbao <\/span> <\/i> 9<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n
\n

\u58f0\u660e\u672c\u4eba\u83dc\u9e1f\u4e00\u4e2a\uff0c\u4e0b\u9762\u662f\u6211\u6574\u7406\u7684\u6d41\u7a0b\uff0c\u60f3\u5728 v2 \u5bfb\u6c42\u6700\u4f73\u5b9e\u8df5 \u54ea\u91cc\u4e0d\u5bf9\u8bf7\u5404\u4f4d\u5927\u795e\u6307\u70b9\u3002<\/p>\n<\/blockquote>\n

Fork<\/h3>\n

Fork \u9879\u76ee\u5230\u81ea\u5df1\u4ed3\u5e93<\/p>\n

Clone<\/h3>\n

\u514b\u9686\u5230\u672c\u5730<\/p>\n

git remote add upstream<\/h3>\n

\u6dfb\u52a0\u4e0a\u6e38 remote \u7528\u6765\u65f6\u523b\u4fdd\u6301\u548c\u4e0a\u6e38\u540c\u6b65<\/p>\n

git pull upstream master<\/h3>\n

\u6bcf\u6b21\u5f00\u53d1\u524d\u90fd\u62c9\u53d6\u6700\u65b0\u4ee3\u7801\uff08\u597d\u4e60\u60ef\uff1f\uff09<\/p>\n

git checkout -b dev-branch<\/h3>\n

\u4e0d\u5728 master \u5f00\u53d1\uff0c\u65b0\u5efa\u5206\u652f\u5f00\u53d1<\/p>\n

git checkout master && git pull upstream master<\/h3>\n

\u4ee3\u7801\u5f00\u53d1\u5b8c\u6210\u518d\u62c9\u4e00\u6b21<\/p>\n

git checkout dev-branch<\/h3>\n

\u5207\u6362\u56de\u5f00\u53d1\u5206\u652f<\/p>\n

git rebase master<\/h3>\n

\u8fd9\u662f\u6211\u65b0\u5b66\u7684\u3002\u4ee5\u524d\u6211\u90fd\u662f\u76f4\u63a5\u5207\u56de master \u7136\u540e merge \u5f00\u53d1\u5206\u652f push \u7684 \u6211\u76ee\u524d\u7406\u89e3\u7684\u4f5c\u7528\u662f\u5c06\u6211\u7684\u4fee\u6539\u653e\u5230\u4e0a\u6e38 commit \u7684\u6700\u540e\u3002 \u5982\u679c\u4e0a\u6e38\u5e76\u6ca1\u6709\u66f4\u65b0\u8fd9\u90e8\u53ef\u4ee5\u4e0d\u7528\uff1f\u7528\u4e86\u4e5f\u6ca1\u6548\u679c\u3002<\/p>\n

git push origin dev-branch<\/h3>\n

\u5c06\u5f00\u53d1\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/p>\n

pull request<\/h3>\n

\u53d1\u8d77 pull request \u7b49\u5f85\u5408\u5e76<\/p>\n

\u5220\u9664\u5206\u652f<\/h3>\n

\u8fd9\u79cd\u6bd4\u5982\u8d21\u732e\u4e00\u4e2a\u5c0f\u529f\u80fd\u6216\u8005\u4fee\u590d\u4e00\u4e2a bug \u7684\u5206\u652f\u4f55\u65f6\u80fd\u5220\u9664\uff1f \u6b63\u786e\u7684\u5220\u9664\u65b9\u5f0f\uff1f git push origin –delete dev-branch \uff1f<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (6<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : yizmaoaa <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u633a\u597d\u7684\u505a\u6cd5\u3002<\/p>\n

    \u6211\u5728\u63d0 Pr \u7684\u65f6\u5019\u5f88\u7b80\u5355\u7c97\u66b4<\/p>\n

    fork -> clone \u4e0b\u6765\u4fee\u6539 ->\u5199\u6d4b\u8bd5\u7528\u4f8b -> \u8dd1\u6d4b\u8bd5\u7528\u4f8b ->\u63d0\u4ea4\u4ee3\u7801 -> \u53d1 Pr <\/p>\n

    \u5220\u9664\u5206\u652f\u7684\u8bdd\uff0c\u7b49\u9879\u76ee\u5408\u5e76\u4f60 Pr \u4e4b\u540e\u5c31\u53ef\u4ee5\u5e72\u6389\u4e86<\/p>\n

    \u6211\u5f80\u5f80\u662f\u8fd9\u6837\u7684\uff0c\u5982\u679c\u6211\u4e4b\u524d Fork \u8fc7\u8fd9\u4e2a\u9879\u76ee\uff0c\u7136\u540e\u6211\u518d\u9700\u8981\u63d0 Pr \u7684\u65f6\u5019\u6211\u76f4\u63a5\u5220\u9664\u6211 fork \u7684\u4ed3\u5e93\uff0c\u91cd\u65b0 fork \u3002<\/p>\n

    \u53e6\u5916\uff0ccherrypick \u4e5f\u662f\u4e00\u4e2a\u5f88\u597d\u7684\u529f\u80fd <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : dddddd <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4fdd\u6301\u548c\u4e0a\u6e38\u540c\u6b65\u6211\u662f\u7528\u7684 github \u7684 pull request \u65b9\u5f0f \uff0c\u8fd9\u6837\u80fd\u65b9\u4fbf\u7684\u89e3\u51b3\u51b2\u7a81\uff0c\u800c\u4e14\u5f88\u6e05\u6670 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : renmu123 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u662f\u65b0\u5efa\u4e00\u4e2a\u5206\u652f\u5f00\u53d1\u5b8c\u76f4\u63a5\u4e0a github \u63d0 pr <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : monkeyWie <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e0d\u7528\u5207\u56de master \u505a pull\uff0c\u76f4\u63a5 git fetch+git rebase upstream\/master <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : genius2k <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    fork, \u5f00\u4e24\u4e2a\u5206\u652f\uff0c\u4e00\u4e2a dev\uff0c\u4e00\u4e2a master
    master \u6c38\u8fdc\u53ea\u7528 git reset –hard \u548c upstream \u4fdd\u6301\u5b8c\u5168\u4e00\u81f4
    dev \u7528\u6765\u5f00\u53d1\u65b0\u7279\u6027\uff0c\u6bcf\u5b8c\u6210\u4e00\u4e2a\u65b0\u7279\u6027\uff0c\u5148\u540c\u6b65 master \u7136\u540e\u4ece master \u5f00\u51fa\u4e00\u4e2a\u65b0\u7684 patch\uff0c\u518d merge dev \u5230 patch \u3002\u8fd9\u6837\u4fdd\u8bc1\u63d0\u4ea4\u7684 patch \u53ef\u4ee5\u7528\u6700\u5c11\u7684 effort \u5408\u5e76
    rebase \u5076\u5c14\u7528\uff0c\u4f46\u4e3b\u8981\u662f\u7528\u6765 squash dev \u4e0a\u7684\u9636\u6bb5\u6027\u4ee3\u7801\u6216\u8005 reword commit message <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : yupozhang <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5f00\u6e90\u8fd0\u7ef4\u5e73\u53f0\uff1a https:\/\/github.com\/openspug\/spug
    \u6b22\u8fce\u53c2\u4e0e\u8d21\u732e\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    \u4e3a\u5f00\u6e90\u9879\u76ee\u8d21\u732e\u4ee3\u7801\u7684\u6700\u4f73\u5b9e\u8df5\uff08\u6700\u8d1f…<\/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\/136096"}],"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=136096"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/136096\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=136096"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=136096"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=136096"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}