{"id":231235,"date":"2020-12-28T11:34:42","date_gmt":"2020-12-28T03:34:42","guid":{"rendered":"http:\/\/4563.org\/?p=231235"},"modified":"2020-12-28T11:34:42","modified_gmt":"2020-12-28T03:34:42","slug":"git-%e8%84%8f%e5%88%86%e6%94%af%e6%96%b0%e7%9a%84%e4%bf%ae%e6%94%b9%e5%a6%82%e4%bd%95-merge-%e5%88%b0%e5%bc%80%e5%8f%91%e5%88%86%e6%94%af","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=231235","title":{"rendered":"git \u810f\u5206\u652f\u65b0\u7684\u4fee\u6539\u5982\u4f55 merge \u5230\u5f00\u53d1\u5206\u652f"},"content":{"rendered":"
\n
\n
\n

git \u810f\u5206\u652f\u65b0\u7684\u4fee\u6539\u5982\u4f55 merge \u5230\u5f00\u53d1\u5206\u652f <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : geledelai1990000 <\/span> <\/i> 5<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n

\u5927\u795e\u4eec\uff0c\u6c42\u52a9\u3002<\/p>\n

\u80cc\u666f\uff1atest \u662f\u810f\u5206\u652f\uff0cdev \u662f\u6700\u65b0\u7684\u4ece master \u62c9\u51fa\u6765\u5206\u652f\u3002<\/p>\n

\u4e00\u4e2a\u9700\u6c42\u66f4\u6539\uff0c\u5fd8\u8bb0\u4e86 checkout \u5230 dev\uff0c\u800c\u662f\u5728 test \u4e0a\u6539\u7684\u3002<\/p>\n

\u5982\u4f55\u628a\u810f\u5206\u652f test \u7684\u8fd9\u90e8\u5206\u4fee\u6539 merge \u5230 dev \u4e0a\uff1f<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (14<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : tyx1703 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    cherry-pick <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : heyjei <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @tyx1703 \u914d\u5408 sourcetree \u4f7f\u7528 cherry pick \u66f4\u9999\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ytmsdy <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e0b\u4e2a sourcetree\uff0c\u7136\u540e\u4e00\u5757\u4e00\u5757\u7684\u6682\u5b58 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Jirajine <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5728 test \u5206\u652f\u4e0a
    git reset <\u4f60\u60f3\u8981 merge \u7684 commit \u63d0\u4ea4\u524d>
    git checkout –merge dev
    #\u89e3\u51b3\u51b2\u7a81
    git add .
    git commit <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : chibupang <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git reset HEAD
    git stash
    git checkout dev
    git stash pop <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : dswyzx <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6709\u4e86 gui\uff0c\u4e00\u5207\u7684\u9a9a\u64cd\u4f5c\u90fd\u662f\u90a3\u4e48\u7b80\u5355\u3002\u4f46\u6bd5\u7adf v2er\uff0cgitbash \u4fdd\u5e73\u5b89\u3002
    \u6211\u53ea\u77e5\u9053\u5173\u952e\u5b57 \u6458\u53d6 \u5c31\u662f\u4f60\u60f3\u8981\u7684 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : kingfun <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    sourcetree \u4e00\u4e2a\u9074\u9009\u529f\u80fd\u5c31\u79d2\u6740\u4e0a\u9762\u5404\u79cd\u7e41\u6742\u7684\u547d\u4ee4\u884c\u4e86\uff0c\u53ef\u4ee5\u57fa\u4e8e\u4efb\u610f\u4e00\u6b21 commit \u8fdb\u884c merge \u5230\u4efb\u4f55\u4e00\u4e2a\u5206\u652f\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : mouyong <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git log -2 \u67e5\u770b commit hash\uff0c\u7136\u540e\u6267\u884c git cherry-pick \u6307\u5b9a\u7684 commit hash \u503c <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : leelz <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git log<\/p>\n

    \u590d\u5236 commit id<\/p>\n

    git checkout dev<\/p>\n

    git cherry-pick commit id <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : zoomdong <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u76f4\u63a5\u628a\u8fd9\u4e2a\u63d0\u4ea4 cherry-pick \u8fc7\u53bb\u5c31\u884c\u4e86 <\/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
    Rebase \u6216\u8005 Cherry-pick \u6216\u8005\u63d0\u51fa\u6587\u4ef6\u7136\u540e Commit \u90fd\u53ef\u4ee5\u3002
    \u672c\u8d28\u4e0a\u662f\u628a\u66f4\u6539\u5dee\u5206\u4ece\u4e00\u4e2a\u5206\u652f\u642c\u5230\u53e6\u4e00\u4e2a\u5206\u652f\uff0c\u5f88\u591a\u64cd\u4f5c\u90fd\u53ef\u4ee5\u5b9e\u73b0\u8fd9\u4e2a\u7ed3\u679c\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : LudwigWS <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @kingfun \u4e0d\u5c31\u662f cherry-pick \u5417\uff0c\u4e00\u884c\u547d\u4ee4\u7684\u4e8b\u3002\u7528 GUI Git \u8fd8\u60f3\u79d2\u6740\u547d\u4ee4\u884c <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Jarvennnnnnnn <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    sourcetree \u662f\u4ec0\u4e48\u8f6f\u4ef6 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : we3613040 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @Jarvennnnnnnn git \u56fe\u5f62\u5de5\u5177 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    git \u810f\u5206\u652f\u65b0\u7684\u4fee\u6539\u5982\u4f55 mer…<\/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\/231235"}],"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=231235"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/231235\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=231235"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=231235"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=231235"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}