{"id":152871,"date":"2020-09-08T00:06:29","date_gmt":"2020-09-07T16:06:29","guid":{"rendered":"http:\/\/4563.org\/?p=152871"},"modified":"2020-09-08T00:06:29","modified_gmt":"2020-09-07T16:06:29","slug":"git-%e5%8f%af%e4%bb%a5%e5%9c%a8-b-%e5%88%86%e6%94%af%e7%9b%b4%e6%8e%a5%e6%8e%a8%e9%80%81%e6%94%b9%e5%8a%a8%e7%bb%99-a-%e5%88%86%e6%94%af%e5%90%88%e5%b9%b6-%e8%80%8c%e4%b8%8d%e7%94%a8%e5%88%87","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=152871","title":{"rendered":"git \u53ef\u4ee5\u5728 B \u5206\u652f\u76f4\u63a5\u63a8\u9001\u6539\u52a8\u7ed9 A \u5206\u652f\u5408\u5e76, \u800c\u4e0d\u7528\u5207\u6362\u5230 A \u5206\u652f\u7684\u529e\u6cd5\u5417?"},"content":{"rendered":"
\n
\n
\n

git \u53ef\u4ee5\u5728 B \u5206\u652f\u76f4\u63a5\u63a8\u9001\u6539\u52a8\u7ed9 A \u5206\u652f\u5408\u5e76, \u800c\u4e0d\u7528\u5207\u6362\u5230 A \u5206\u652f\u7684\u529e\u6cd5\u5417? <\/h1>\n

<\/p>\n

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

\u6211\u73b0\u5728\u5728 dev \u5206\u652f\uff0c\u63d0\u4ea4\u4e86\u4e00\u4e2a commit\uff0c\u60f3\u8ba9 master \u5408\u5e76\u8fd9\u51e0\u4e2a\u6539\u52a8
\u6211\u53ea\u77e5\u9053\u8981\u5148\u5207\u6362\u5230 master \u5206\u652f\uff0c\u7136\u540e\u518d git merge dev \u5b9e\u73b0\u5408\u5e76
\u6709\u529e\u6cd5\u5b9e\u73b0\u4e0d\u7528\u5207\u6362\u5230 master \u5206\u652f\uff0c\u76f4\u63a5\u8ba9 master \u5206\u652f\u5408\u5e76\u8fd9\u4e00\u4e2a commit \u5417\uff1f<\/p>\n

\u8fd9\u79cd\u5207\u6362\u5230 master \u5206\u652f\uff0c\u518d git merge \u7684\u65b9\u5f0f\u8ba9\u6211\u8fd9\u4e2a\u5f3a\u8feb\u75c7\u96be\u53d7\uff1a<\/p>\n

    \n
  1. \u5207\u6362\u5230 master \u5206\u652f\uff0cgit \u4f1a\u628a\u6211\u5728 dev \u5206\u652f\u91cc\u65b0\u5efa\u7684\u6587\u4ef6\u90fd\u5220\u6389\uff0c\u6062\u590d master \u5206\u652f\u7684\u72b6\u6001<\/li>\n
  2. \u7136\u540e\u6211\u518d git merge dev\uff0c\u5c31\u53c8\u628a\u90a3\u4e9b\u6587\u4ef6\u521b\u5efa\u56de\u6765<\/li>\n<\/ol>\n

    \u5982\u679c\u6211\u5728 dev \u5206\u652f\u7684 commit \u91cc\u521b\u5efa\u4e86\u51e0\u767e\u4e2a\u6587\u4ef6\uff0c\u8fd9\u4e00\u6765\u4e00\u56de\u5c31\u8981\u6539\u52a8\u51e0\u767e*2 \u7684\u6587\u4ef6\uff0c\u5c31\u5f88\u4e0d\u723d<\/p>\n

    \u5982\u679c\u80fd\u8ba9 master \u5206\u652f\u5148\u5408\u5e76\u4e86\uff0c\u6211\u518d\u5207\u6362\u5230 master \u5206\u652f\uff0c\u8fd9\u6837\u5c31\u4e0d\u7528\u5220\u8fd9\u4e9b\u6587\u4ef6\u53c8\u6062\u590d\u8fd9\u4e9b\u6587\u4ef6<\/p>\n<\/p><\/div>\n

    \u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (44<\/span>) <\/div>\n
    <\/div>\n<\/p><\/div>\n<\/p><\/div>\n
      \n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : blindie <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u53ef\u4ee5\u4e86\u89e3\u4e00\u4e0b git stash \u8fd9\u4e2a\u529f\u80fd <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 5bb864e1fc775087 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @blindie #1 git stash \u6211\u77e5\u9053\uff0c\u4f46\u4e0d\u662f\u8fd9\u4e2a\u7528\u9014\u5427\uff1f git stash \u4e0d\u5c31\u662f\u628a\u672a\u63d0\u4ea4\u7684\u6587\u4ef6\uff0c\u627e\u4e2a\u5730\u65b9\u5b58\u8d77\u6765\uff0c\u7136\u540e\u628a\u6682\u5b58\u533a\u6e05\u7a7a\uff08\u5e94\u8be5\u662f\u53eb\u6682\u5b58\u533a\u5427\u5fd8\u4e86\uff09\uff0c\u4e8b\u540e\u53ef\u4ee5\u518d\u6062\u590d\u51fa\u6765 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 5bb864e1fc775087 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @5bb864e1fc775087 #2 git stash \u8ddf\u6211\u8bf4\u7684\u4e1c\u897f\u6ca1\u5173\u7cfb\u5427 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : silentsee <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      git stash
      git checkout master
      git merge dev
      git checkout dev
      git stash pop <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : TMaize <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u6211\u90fd\u662f\u9879\u76ee\u518d\u590d\u5236\u4e00\u4efd\uff0c\u4e00\u4e2a\u7528\u6765\u5408\u5e76\uff0c\u4e00\u4e2a\u7528\u6765\u5f00\u53d1 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 5bb864e1fc775087 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @silentsee #4 \u597d\u5427 \u6211\u5e16\u5b50\u6ca1\u8bf4\u6e05\u695a\uff1b\u6211\u4e3e\u7684\u4f8b\u5b50\u662f\u6211\u5f53\u524d\u5728 dev \u5206\u652f, \u5df2\u7ecf\u628a\u6539\u7684\u4e1c\u897f\u90fd git commit \u4e86, \u8fd9\u65f6\u6267\u884c git status \u663e\u793a\u6211\u6ca1\u6709\u672a\u63d0\u4ea4\u7684\u6539\u52a8; \u8fd9\u65f6\u6211\u5728 dev \u5206\u652f\u6211\u8981\u628a\u6211\u521a\u521a\u5728 dev \u5206\u652f\u63d0\u4ea4\u7684 commit \u5408\u5e76\u5230 master \u5206\u652f <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 5bb864e1fc775087 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u4e3e\u4e2a\u4f8b\u5b50
      git init \/\/ \u8fd9\u65f6\u6211\u5728 master \u5206\u652f
      git checkout -b dev
      touch test
      git commit -m “test”
      \u7136\u540e\u6211\u73b0\u5728\u5728 dev \u5206\u652f, \u8981\u628a\u521a\u521a\u63d0\u4ea4\u7684 commit “test” \u5408\u5e76\u5230 master \u5206\u652f, \u4f46\u662f\u4e0d\u60f3\u7528 git checkout master; git merge dev \u8fd9\u79cd\u65b9\u5f0f <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : lcdtyph <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u5982\u679c\u4f60\u786e\u5b9a\u8fd9\u6b21 merge \u53ef\u4ee5 fast forward \u7684\u8bdd\u53ef\u4ee5\u8fd9\u6837<\/p>\n

      git branch -f master dev<\/p>\n

      \u4f46\u662f\u4e0d\u5efa\u8bae\u8fd9\u4e48\u64cd\u4f5c <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : viggoc <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      cherry-pick \u4e86\u89e3\u4e00\u4e0b <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : sfqtsh <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u7528 worktree \u5427 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : Kobayashi <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u73b0\u5728\u7684\u5e74\u8f7b\u4eba\u600e\u4e48\u90fd\u8fd9\u4e48\u61d2\u4e86\uff1f https:\/\/stackoverflow.com\/q\/3216360\/5101148 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : nicklooo <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @viggoc \u6211\u89c9\u5f97\u4e3b\u9700\u8981\u7684\u5c31\u662f\u8fd9\u4e2a <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : ddsfeng <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @Kobayashi \u81ea\u5df1\u5148\u8bd5\u4e00\u4e0b\u518d\u8bb2, stackoverflow \u4e0a\u9762\u6700\u9ad8\u7968\u7684\u56de\u7b54.<\/p>\n

      \u91cc\u9762\u8bb2\u4e86\u4e24\u79cd<\/p>\n

      \u7b2c\u4e00\u79cd:
      git fetch . foo:master<\/p>\n

      \u8fd9\u6761\u4ec5\u9650\u4e8e master \u5230 foo \u53ef\u4ee5 fast-forward<\/p>\n

      \u7b2c\u4e8c\u79cd:
      git fetch <remote> +<remoteBranch>:<localBranch><\/p>\n

      \u591a\u7684\u8fd9\u4e2a+\u53f7, \u5982\u679c\u7528\u4e86\u7684\u8bdd, \u662f\u5f3a\u5236\u5c06 localBranch \u7684\u4f4d\u7f6e\u66f4\u65b0\u5230 remoteBranch \u4f4d\u7f6e.<\/p>\n

      \u5373 \u5982\u679c master \u4e0a\u6709\u5176\u4ed6\u7684\u63d0\u4ea4, \u90a3\u4e48\u4e0d\u597d\u610f\u601d, \u4e22\u4e86..<\/p>\n

      \u6240\u4ee5\u5c31\u76ee\u524d\u6765\u8bf4, \u5982\u679c\u5b58\u5728 master \u5230 \u5f53\u524d\u5206\u652f \u9700\u8981\u8fdb\u884c\u6b63\u5e38\u5408\u5e76\u7684, \u662f\u6ca1\u6709\u529e\u6cd5 \u4e0d\u5207\u6362\u5206\u652f\u8fdb\u884c merge \u7684. (\u53c2\u89c1\u90a3\u4e2a\u5e16\u5b50\u4e2d, \u7b2c\u4e8c\u4e2a\u56de\u590d).<\/p>\n

      \u5982\u679c\u53ef\u4ee5 fast-forward \u8fc7\u6765\u7684, \u53c2\u89c1\u4e0a\u9762\u7b2c\u4e00\u79cd\u65b9\u6cd5. <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : blindie <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @5bb864e1fc775087 \u4e0d\u7ba1\u662f github flow \u8fd8\u662f git flow \u90fd\u4e0d\u4f1a\u9891\u7e41\u51fa\u73b0 merge \u5230 master \u7684\u9700\u6c42\u3002\u5982\u679c\u4f7f\u7528 gitlab \u5408\u4f5c\u6a21\u5f0f\u8d70 mr \u63d0\u4ea4\u4e0a master \u5219\u53ef\u4ee5\u76f4\u63a5\u5728 gitlab \u4e0a\u63d0 mr \u3002\u51b5\u4e14\u6211\u770b\u4f60\u56de\u7b54\u90fd\u61c2\uff0c4 \u56de\u7b54\u5b8c\u5168\u89e3\u51b3\u4f60\u7684\u95ee\u9898\uff0c\u4e3a\u4ec0\u4e48\u4e0d\u5199\u4e2a shell \uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : newtype0092 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u5982\u679c\u4f60\u5206\u652f\u5dee\u5f02\u786e\u5b9e\u8fd9\u4e48\u5927\uff0c\u5207\u6362\u8d77\u6765\u611f\u89c9\u9ebb\u70e6\u7684\u8bdd\uff0c\u91cd\u65b0\u62c9\u4e00\u4e2a\u4ed3\u5e93\u957f\u671f\u653e\u5728 master \u5206\u652f\u5c31\u597d\u4e86\uff0c\u53ea\u9700\u5408\u5e76\u5c31 cd \u5230\u65b0\u4ed3\u5e93\u7684\u6587\u4ef6\u5939\u64cd\u4f5c\uff0c\u4e0d\u7528\u5207\u5206\u652f\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : gqbre <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      git rebase dev master
      \u4e0d\u8981\u8f7b\u6613\u5c1d\u8bd5\uff0c\u9664\u975e\u4f60\u77e5\u9053\u600e\u4e48\u8fd8\u539f <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 5bb864e1fc775087 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @blindie #14 4 \u8bf4\u7684\u5c31\u662f\u6211\u4e3b\u8d34\u91cc\u8bf4\u7684\uff0c\u5148\u5207\u5230 master \u518d\u5408\u5e76\u3002\u6211\u5e73\u65f6\u5c31\u662f\u8fd9\u4e48\u505a\u7684\uff0c\u53ea\u662f\u4e0d\u723d\u4e00\u6765\u4e00\u56de\u5220\u6389\u6587\u4ef6\u53c8\u6062\u590d\u56de\u6765\u3002\u6240\u4ee5\u624d\u6765\u95ee\u95ee\u6709\u6ca1\u6709\u4e0d\u5207\u6362\u5230 master \u5206\u652f\u7684\u65b9\u6cd5 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 5bb864e1fc775087 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @viggoc #9 \u6211\u7406\u89e3\u7684 cherry-pick \u5c31\u662f\u628a\u53e6\u4e00\u4e2a\u5206\u652f\u7684\u67d0\u4e2a \/\u67d0\u4e9b commit\uff0c\u5355\u72ec\u62ff\u5230\u6211\u5f53\u524d\u5206\u652f\u518d commit \u4e00\u904d\u3002\u5982\u679c\u6211\u6ca1\u7406\u89e3\u9519\uff0c\u90a3\u6211\u8981\u7684\u60c5\u51b5\u5c31\u4e0d\u9002\u5408\uff0c\u56e0\u4e3a\u6267\u884c cherry pick \u524d\u63d0\u6211\u8981\u5148\u5207\u6362\u5230 master \u5206\u652f\uff0c\u4f46\u662f\u6211\u8981\u7684\u662f\u4e0d\u5207\u6362\u5230 master \u5206\u652f\u7684\u65b9\u6cd5 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : zyfsuzy <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      cherry-pick \u7528\u4e00\u4e0b <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : silentsee <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @5bb864e1fc775087 \u4f60\u662f\u8bf4\u56e0\u4e3a\u8fd9\u51e0\u767e\u4e2a\u6587\u4ef6\u7684\u63d0\u4ea4\u5bfc\u81f4\u5207\u6362\u5206\u652f\u5f88\u6162\u5417\uff1f\u6309\u9053\u7406\u4e0d\u4f1a\u592a\u6162\u7684\uff0c\u9664\u975e\u4f60\u8fd9\u51e0\u767e\u4e2a\u6587\u4ef6\u5341\u5206\u5de8\u5927\u3002\u8fd8\u662f\u8bf4\u4f60\u5c31\u662f\u5f3a\u8feb\u75c7\uff0c\u89c9\u5f97\u6709\u51e0\u767e\u4e2a\u6587\u4ef6\u7684\u53d8\u52a8\u5c31\u4f1a\u8ba9\u4f60\u4e0d\u723d\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : Mrun <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      git rebase –onto \u770b\u4e00\u4e0b <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : q8164305 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u90a3\u4f60\u53ea\u80fd gitclone \u4e24\u4e2a\u9879\u76ee\u4e86\uff0c\u4e00\u4e2a\u7528\u6765\u5f00\u53d1\uff0c\u4e00\u4e2a\u7528\u6765\u5408\u5e76\uff0c\u5148\u628a\u4ee3\u7801\u63a8\u4e0a\u53bb\uff0c\u7136\u540e\u53e6\u4e00\u4e2a\u9879\u76ee\u62c9\u4e0b\u6765\u5408\u5e76\u518d\u63a8 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 5bb864e1fc775087 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @silentsee #20 \u4e0d\u662f\u6162\uff0c\u53ea\u662f\u5f3a\u8feb\u75c7\u4e0d\u559c\u6b22\u8fd9\u6837 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : wushigejiajia01 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u4e0a\u4e00\u7fa4\u4eba \u8fde\u5e16\u5b50\u90fd\u6ca1\u770b\u660e\u767d\u5417?
      \u4e3b\u7684\u9700\u6c42: \u5c06 B \u5206\u652f\u5408\u5e76\u5230 A \u5206\u652f\u65f6, \u4e0d\u9700\u8981\u5207\u6362\u5230 A \u5206\u652f\u5c31\u80fd\u76f4\u63a5\u5c06 B \u5206\u652f\u4ee3\u7801\u63d0\u4ea4\u7ed9 A \u5206\u652f<\/p>\n

      \u8bf4\u5b9e\u8bdd, \u6211\u4e5f\u89c9\u5f97\u8fd9\u6837\u7684\u64cd\u4f5c\u5f88\u9ebb\u70e6,
      \u6bcf\u6b21\u5728\u4e34\u65f6\u5206\u652f\u4e0a\u5199\u5b8c\u4ee3\u7801\u63d0\u4ea4 PUSH \u5b8c,
      \u5982\u679c\u9700\u8981\u5408\u5e76\u5230 DEV, \u6211\u90fd\u5f97 [ \u5148\u5207\u6362\u5230 DEV \u5206\u652f\u624d\u80fd\u5c06\u4e34\u65f6\u5206\u652f\u7684\u4ee3\u7801\u5408\u5e76\u5230 DEV ]<\/p>\n

      \u8fd9\u79cd\u611f\u89c9\u5c31\u662f “\u53ea\u80fd\u64cd\u4f5c\u5f53\u524d\u6240\u5728\u5206\u652f, \u4e0d\u53ef\u8de8\u5206\u652f\u64cd\u4f5c”<\/p>\n

      \u6211\u4e5f\u60f3\u77e5\u9053\u6709\u6ca1\u6709\u4ec0\u4e48\u65b9\u6cd5\u80fd\u51cf\u5c11\u8fd9\u6837\u7684”\u53ea\u80fd\u5728 A \u5206\u652f\u8fdb\u884c’\u5c06 B \u5206\u652f\u5408\u5e76\u5230 A \u5206\u652f\u7684\u64cd\u4f5c'” <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : WilliamYang <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u524d\u540c\u4e8b\u6559\u6211\u7684\uff0c\u597d\u50cf\u662f git push -u origin dev:master \u5177\u4f53\u5fd8\u8bb0\u4e86\uff0c\u5c31\u662f\u76f4\u63a5\u5c06 dev \u63a8\u9001\u5230 master <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : teawithlife <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u5176\u5b9e\u5148\u6cbb\u7597\u5f3a\u8feb\u75c7\u624d\u662f\u5f53\u52a1\u4e4b\u6025[\u72d7\u5934]
      \u4e3b\u53ef\u4ee5\u5148\u8bf4\u4e00\u4e0b\u4e3a\u5565\u4f1a\u6709\u4e00\u6b21\u65b0\u589e\u51e0\u767e\u4e2a\u6587\u4ef6\u7684\u60c5\u51b5\u5417\uff1f
      \u5982\u679c\u8fd9\u79cd\u60c5\u51b5\u51fa\u73b0\u9891\u7387\u5f88\u4f4e\uff0c\u90a3\u5c31\u5fcd\u5fcd\u7528 checkout \u5427\uff0c\u6216\u8005\u50cf\u4e0a\u51e0\u4f4d\u8bf4\u7684\uff0c\u653e\u4e24\u4e2a\u4e0d\u540c\u7684\u6587\u4ef6\u5939
      \u5982\u679c\u51fa\u73b0\u6982\u7387\u5f88\u9ad8\uff0c\u6211\u611f\u89c9 git \u4e0d\u662f\u4e00\u4e2a\u9002\u5408\u7684\u5de5\u5177 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : lsdm999 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      1. \u8fd9\u79cd\u5207\u6362\u5230 master \u5206\u652f\uff0c\u518d git merge \u7684\u65b9\u5f0f\u8ba9\u6211\u8fd9\u4e2a\u5f3a\u8feb\u75c7\u96be\u53d7
      dev \u5206\u652f\u90fd\u6709\u53ef\u80fd\u4ee3\u7801\u51b2\u7a81\uff0c\u4f60\u80fd\u4fdd\u8bc1\u8de8 master \u5206\u652f commit \u4e0d\u51fa\u73b0\u4ee3\u7801\u51b2\u7a81\uff1f
      2. \u5207\u6362\u5230 master \u5206\u652f\uff0cgit \u4f1a\u628a\u6211\u5728 dev \u5206\u652f\u91cc\u65b0\u5efa\u7684\u6587\u4ef6\u90fd\u5220\u6389\uff0c\u6062\u590d master \u5206\u652f\u7684\u72b6\u6001
      \u7136\u540e\u6211\u518d git merge dev\uff0c\u5c31\u53c8\u628a\u90a3\u4e9b\u6587\u4ef6\u521b\u5efa\u56de\u6765
      git stash \u641e\u5b9a
      3. \u5982\u679c\u6211\u5728 dev \u5206\u652f\u7684 commit \u91cc\u521b\u5efa\u4e86\u51e0\u767e\u4e2a\u6587\u4ef6\uff0c\u8fd9\u4e00\u6765\u4e00\u56de\u5c31\u8981\u6539\u52a8\u51e0\u767e*2 \u7684\u6587\u4ef6\uff0c\u5c31\u5f88\u4e0d\u723d
      git cherry-pick \u641e\u5b9a\uff08\u5982\u4f60\u6240\u63cf\u8ff0\u7684\uff0c\u5207\u6362\u5206\u652f\u662f\u6700\u7b80\u5355\u4e0d\u8017\u65f6\u7684\u64cd\u4f5c\uff09 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : lsdm999 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u770b\u9519\u4e86\uff0c2+3\uff1a\u90fd\u7528 git cherry-pick \u5373\u53ef <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 5bb864e1fc775087 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @lsdm999 #27 \u539f\u672c\u6211\u4e0d\u8ba4\u4e3a git stash \u548c cherry-pick \u80fd\u5b9e\u73b0\u6211\u7684\u9700\u8981\uff0c\u4f46\u662f\u770b\u5230\u597d\u51e0\u4e2a\u4eba\u8bf4\uff0c\u6211\u5728\u60f3\u4f1a\u4e0d\u4f1a\u662f git stash \u548c cherry-pick \u6709\u6211\u4e0d\u77e5\u9053\u7684\u4f5c\u7528\u3002\u80fd\u5426\u6309\u7167\u6211 7 \u7684\u4f8b\u5b50\uff0c\u63a5\u7740\u7528 git stash \u548c cherry-pick \u5f80\u4e0b\u5199\u547d\u4ee4\u3002
      \u6211\u7406\u89e3\u7684 cherry-pick \u662f\u8fd9\u6837\u7684\uff1a\u8981\u7528 cherry-pick \u628a dev \u5206\u652f\u7684 commit \u5408\u5e76\u5230 master \u5206\u652f\uff0c\u524d\u63d0\u8981\u5148\u5207\u6362\u5230 master \u5206\u652f\u624d\u884c\uff0c\u56e0\u4e3a cherry-pick \u53ea\u80fd\u662f\u628a\u5176\u4ed6\u5206\u652f\u7684 commit \u8f6c\u5230\u5f53\u524d\u5206\u652f\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : lsdm999 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u5176\u5b9e 4 \u90a3\u4e2a\u65b9\u6848\u5df2\u7ecf\u5f88\u63a5\u8fd1\u4e86\u3002
      git stash
      git checkout master
      git cherry-pick commit-hash \u503c
      git push
      git checkout dev
      git stash pop
      \u6ca1\u6709\u51b2\u7a81\u7684\u8bdd\u6574\u4e2a\u8fc7\u7a0b\u5e94\u8be5\u633a\u5feb\u7684\u3002
      [cherry-pick \u8fd9\u4e00\u6b65\u6709\u51b2\u7a81\u5565\u7684\u4f1a\u6709\u63d0\u793a\uff0c\u53ef\u4ee5\u5148 git status \u770b\u4e0b\u72b6\u6001\uff0c\u90a3\u5c31\u64a4\u9500\u7136\u540e\u8d70 merge \u624b\u52a8\u89e3\u51b3\u51b2\u7a81] <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : lsdm999 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u5982\u679c dev commit \u540e\u6ca1\u6709\u4fee\u6539\uff0cstash \u90fd\u53ef\u4ee5\u7701\u6389 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 5bb864e1fc775087 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @lsdm999 #31 \u597d\u5427\u8fd8\u662f\u6211\u4e3b\u6ca1\u8bf4\u6e05\u695a\u3002\u987a\u7740\u6211 7 \u7684\u4f8b\u5b50\uff0c\u5e73\u65f6\u6211\u5c31\u662f\u8fd9\u6837\uff1a
      git checkout master
      git merge dev \/\/ \u76f4\u63a5 merge \u5c31\u884c\uff0c\u8fd8\u4e0d\u9700\u8981 cherry pick
      \u6211\u53d1\u8d34\u7684\u4e3b\u8981\u76ee\u7684\u5c31\u662f\u60f3\u95ee\u80fd\u4e0d\u80fd\u4e0d\u6267\u884c git checkout master\uff0c\u4e5f\u5c31\u662f\u4e0d\u8981\u5207\u6362\u5230 master \u5206\u652f\uff0c\u4e14 master \u5206\u652f\u80fd\u4e0e dev \u5206\u652f\u4fdd\u6301\u540c\u6b65 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : v2ft <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u63d0 merge request \u5427\uff0c\u54c8\u54c8 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : Auster <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      cherry pick \u4e0d\u5c31\u662f\u4e3a\u8fd9\u79cd\u60c5\u51b5\u7684\u5417 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : EminemW <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u6211\u7528 idea \u53ef\u4ee5\u76f4\u63a5\u63a8\u5230 Master \u5206\u652f\u554a\u3002\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : guanhui07 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      git stash <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : ooops <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u9996\u5148\uff0cmerge\uff0crebase\uff0ccherry-pick \u4e4b\u7c7b\u7684\u64cd\u4f5c\u4f1a\u4ea7\u751f\u65b0\u7684 commit\uff0c\u8fd9\u5c31\u610f\u5473\u7740\u6709\u53ef\u80fd\u4f1a\u51fa\u73b0 conflict \u3002\u6240\u4ee5\u4e0d\u5148\u5207\u5230\u90a3\u4e2a\u5206\u652f\u662f\u4e0d\u53ef\u80fd\u5b9e\u73b0\u7684\u3002
      \u5176\u6b21\uff0c\u597d\u591a\u5c42\u90fd\u8bf4 cherry-pick \u597d\u50cf\u5ffd\u7565\u4e86\u5b83\u53ea\u80fd\u628a\u5f53\u524d\u5206\u652f cherry-pick
      \u6700\u540e\uff0c\u65b0\u589e\u7684\u6587\u4ef6\u4e5f\u53ef\u4ee5\u5148 git add\uff0c\u518d git stash \u3002\u5982\u679c\u5f3a\u8feb\u75c7\u4e0d\u60f3\u5728 stage area\uff0c\u53ef\u4ee5 pop \u4e4b\u540e reset \u90a3\u4e9b\u65b0\u589e\u7684\u6587\u4ef6\uff0c\u91cd\u56de untrack \u7684\u72b6\u6001\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : yaerda <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u6b63\u597d\u5206\u4eab\u4e2a\u6700\u8fd1\u5b66\u5230\u7684\uff1agit worktree – Manage multiple working trees<\/p>\n

      \u5bf9\u4e8e\u4f60\u8fd9\u4e2a\u95ee\u9898\uff1a
      \u5047\u5982\u4f60\u7684\u9879\u76ee\u672c\u5730\u514b\u9686\u5730\u5740\u662f\uff1a\/path\/repo\uff0c
      \u5728\u8fd9\u4e2a\u9879\u76ee\u91cc\u4f7f\u7528\u547d\u4ee4 git worktree add \/path\/repo-m master,\u5c31\u53ef\u4ee5\u521b\u5efa\u51fa\u4e00\u4e2a\u65b0\u7684\u6587\u4ef6\u5939 \/path\/repo-m,\u5bf9\u5e94\u4e8e master \u5206\u652f\uff0c\u65b0\u7684\u6587\u4ef6\u5939\u53ea\u662f\u539f\u9879\u76ee master \u5206\u652f\u7684\u4e00\u4e2a\u5f15\u7528\uff0c\u4e0d\u7528\u62c5\u5fc3\u5360 2 \u4efd\u9879\u76ee\u7a7a\u95f4
      .
      ..
      \/path\/repo —dev \u5206\u652f
      \/path\/repo-m —master \u5206\u652f<\/p>\n

      \u5047\u4f7f\u4f60\u4e00\u822c\u90fd\u5728 \/path\/repo dev \u5206\u652f\u5f00\u53d1\uff0c\u5f00\u53d1\u5b8c\u540e\uff0c\u76f4\u63a5\u65b0\u5f00\u4e2a\u547d\u4ee4\u7a97\u53e3\u5b9a\u4f4d\u5230 \/path\/repo-m,
      \u5728\u5728 path\/repo-m \u4e0b\u8f7b\u8f7b\u677e\u677e\u4fbf\u53ef\u4ee5 merge \u6216\u8005 cherry-pick dev \u5206\u652f\u7684\u4e1c\u897f\uff0c
      \u65b9\u4fbf\u7684\u5b9e\u73b0\u540c\u4e00\u65f6\u95f4\u672c\u5730\u6709\u591a\u4e2a\u5206\u652f\u5e76\u5b58\uff0c\u518d\u4e5f\u4e0d\u9700\u8981 \u5404\u4e2a\u5e38\u7528\u5206\u652f\u6765\u56de\u5207\uff0c\u4e0d\u65ad\u7684 stash pop<\/p>\n

      \u4ee5\u4e0a\u662f\u4e2a\u4eba\u7684\u4e00\u4e9b\u7c97\u6d45\u7406\u89e3\u548c\u4f7f\u7528\uff0c\u5982\u6709\u4e0d\u5bf9\u6216\u8868\u8fbe\u6709\u8bef\uff0c\u8fd8\u8bf7\u6307\u51fa <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : wangyzj <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      rebase <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : nicklooo <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @ooops git stash save -u <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : yuriko <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      git \u547d\u4ee4\u57fa\u672c\u90fd\u662f\u9488\u5bf9\u5f53\u524d\u5206\u652f\u7684\u64cd\u4f5c\uff0c\u6d89\u53ca\u5230\u64cd\u4f5c\u7a7a\u95f4\u7684\u903b\u8f91\uff0c\u8fd9\u4e2a\u8bbe\u8ba1\u6211\u89c9\u5f97\u5f88\u5408\u7406<\/p>\n

      \u4ee5\u53ca\u672c\u5730\u5207\u6362 git branch \u5f88\u9ebb\u70e6\u6211\u7406\u89e3\uff0c\u4f46\u5173\u6ce8\u70b9\u662f\u6587\u4ef6\u7684\u521b\u5efa\u6d41\u7a0b\u5c31\u662f\u5f3a\u8feb\u75c7\u4e86\uff0c\u4e0d\u7136\u4f60\u8981\u4e0d\u8981\u8003\u8651\u4e0b gitlog \u91cc\u7684\u4e1c\u897f\u90fd\u600e\u4e48\u5b58\u7684\uff1f <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : SergeGao <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u4e0a\u90fd\u4e0d\u8bfb\u9898\u7684\u5417….\u9898\u4e3b\u662f\u60f3\u5728\u4e0d\u5207\u56de master \u5206\u652f\u7684\u60c5\u51b5\u4e0b\u5408\u5e76\u67d0\u5206\u652f\u5230 master \u4e0a,\u8bf4\u4e2a\u6211\u77e5\u9053\u7684\u64cd\u4f5c:<\/p>\n

      git fetch origin branch-dev:master<\/p>\n

      \u8fd9\u4e2a\u547d\u4ee4\u7684\u610f\u601d\u5c31\u662f\u62c9\u53d6 branch-dev \u5206\u652f\u5e76\u5408\u5e76\u5230 master \u5206\u652f,\u6240\u4ee5\u9898\u4e3b\u53ef\u4ee5\u5148 push \u4e00\u4e0b dev \u5206\u652f,\u7136\u540e\u6267\u884c\u4e0b\u4e0a\u9762\u64cd\u4f5c\u5373\u53ef <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : xi_lin <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      @yaerda git worktree \u5b66\u5230\u4e86\uff0c\u611f\u8c22\u3002\u4e0d\u77e5\u9053\u4e3a\u5565\u6211\u5728 v2 \u4e0a\u6ca1\u6709\u70b9\u611f\u8c22\u7684\u5165\u53e3\u4e86\u3002\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n
      \n
      \n
      \u8cc7\u6df1\u5927\u4f6c : standin000 <\/span> <\/div>\n
      <\/i> <\/span> <\/div>\n<\/p><\/div>\n
      \u6b63\u60f3\u63d0 worktree\uff0c\u9700\u8981 git 2.15 \u7248\u672c\uff0c\u4e00\u4e2a\u76ee\u5f55\u5b58\u5728\u591a\u4e2a\u5206\u652f\uff0c\u516c\u7528.git \u76ee\u5f55 <\/div>\n<\/p><\/div>\n<\/li>\n
    • \n","protected":false},"excerpt":{"rendered":"

      git \u53ef\u4ee5\u5728 B \u5206\u652f\u76f4\u63a5\u63a8\u9001\u6539…<\/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\/152871"}],"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=152871"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/152871\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=152871"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=152871"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=152871"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}