{"id":324672,"date":"2021-02-06T11:01:29","date_gmt":"2021-02-06T03:01:29","guid":{"rendered":"http:\/\/4563.org\/?p=324672"},"modified":"2021-02-06T11:01:29","modified_gmt":"2021-02-06T03:01:29","slug":"github-%e4%b8%8a%e7%9a%84%e5%a4%9a%e6%ac%a1-pr-%e6%80%8e%e4%b9%88%e6%89%8d%e8%83%bd%e5%a7%8b%e7%bb%88%e5%8f%aa%e5%8c%85%e5%90%ab-1-%e4%b8%aa-commit","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=324672","title":{"rendered":"github \u4e0a\u7684\u591a\u6b21 pr \u600e\u4e48\u624d\u80fd\u59cb\u7ec8\u53ea\u5305\u542b 1 \u4e2a commit?"},"content":{"rendered":"
\n
\n
\n

github \u4e0a\u7684\u591a\u6b21 pr \u600e\u4e48\u624d\u80fd\u59cb\u7ec8\u53ea\u5305\u542b 1 \u4e2a commit? <\/h1>\n

<\/p>\n

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

\u7b2c\u4e00\u6b21 fork \u540e\uff0c\u63d0\u4ea4\u4e00\u4e2a pr a \u5305\u542b\u4e00\u4e2a commit a\uff0c\u88ab\u4e0a\u6e38\u5408\u5e76\u4e86\u3002<\/p>\n

\u63a5\u7740\u5728\u672c\u5730 pull upstream\uff0c\u8fd9\u65f6\u5019\u4f1a\u6709\u4e2a merged from … \u7684 commit \u5728\u6211\u7684 fork \u4e0a\u3002<\/p>\n

\u63a5\u7740\u6211\u5728\u672c\u5730\u505a\u7b2c\u4e8c\u6b21\u4fee\u6539\uff0c\u53c8\u4ea7\u751f\u4e86\u4e00\u4e2a\u65b0\u7684 commit b\uff0c\u5f00\u4e00\u4e2a\u65b0\u7684 pr b\uff0c\u4f46\u662f\u8fd9\u4e2a pr \u548c\u4e0a\u6e38\u7684\u5206\u53c9\u70b9\u8fd8\u662f\u5728 commit a \u4e4b\u524d\uff0c\u56e0\u6b64\u8fd9\u4e2a pr \u4f1a\u5305\u542b commit a \u548c b \u3002<\/p>\n

\u8bf7\u95ee\u8be5\u5982\u4f55\u8ba9 pr b \u53ea\u5305\u542b commit b \uff1f\u5728\u4e0d\u91cd\u65b0 fork \u7684\u60c5\u51b5\u4e0b\u3002<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (7<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : xiri <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    pull \u7684\u65f6\u5019\u7528 rebase \u5408\u5e76\u5c31\u4e0d\u4f1a\u6709\u90a3\u4e2a merged from \u7684 commit \u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : channingcheng <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @xiri \u5bf9 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : jaween <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    rebase,\u521a\u5728\u6398\u91d1\u770b\u5230\u7684 <\/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
    pull \u7684\u65f6\u5019\u9ed8\u8ba4\u505a fetch+merge \u3002\u800c\u8fd9\u91cc merge \u662f\u9519\u8bef\u64cd\u4f5c\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : zdt3476 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git pull \u2014rebase <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : catror <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    master \u5206\u652f\u548c\u4e0a\u6e38\u4fdd\u6301\u540c\u6b65\uff0c\u4fee\u6539\u4ee3\u7801\u5efa\u65b0\u7684\u5206\u652f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : mxalbert1996 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5982\u679c\u4e0a\u6e38\u6ca1\u5bf9\u4f60\u7684 PR \u505a\u4fee\u6539\uff0c\u90a3\u4e48\u4f60 pull upstream \u7684\u65f6\u5019\u4f1a\u76f4\u63a5 fast forward\uff0c\u4e0d\u4f1a\u6709\u989d\u5916\u7684 commit \u3002\u5982\u679c\u4e0a\u6e38\u662f\u4fee\u6539\u4ee5\u540e\u5408\u5e76\uff0c\u90a3\u4e48\u4f60\u5e94\u8be5\u7528 rebase \u3002\u53e6\u5916\u5efa\u8bae\u8bbe\u7f6e pull \u65f6\u4ec5\u9650 ff \uff08 git config pull.ff only \uff09\uff0c\u6700\u65b0\u7248\u7684 git \u5df2\u7ecf\u4f1a\u5728\u4f60\u6ca1\u6709\u6307\u660e pull \u6a21\u5f0f\u7684\u65f6\u5019\u663e\u793a\u8b66\u544a\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    github \u4e0a\u7684\u591a\u6b21 pr \u600e\u4e48…<\/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\/324672"}],"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=324672"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/324672\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=324672"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=324672"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=324672"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}