{"id":137859,"date":"2020-07-20T16:29:21","date_gmt":"2020-07-20T08:29:21","guid":{"rendered":"http:\/\/4563.org\/?p=137859"},"modified":"2020-07-20T16:29:21","modified_gmt":"2020-07-20T08:29:21","slug":"git-%e4%b8%b4%e6%97%b6%e4%bf%ae%e6%94%b9-bug-%e8%a6%81%e6%80%8e%e4%b9%88%e5%88%9b%e5%bb%ba%e5%88%86%e6%94%af","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=137859","title":{"rendered":"git \u4e34\u65f6\u4fee\u6539 bug \u8981\u600e\u4e48\u521b\u5efa\u5206\u652f"},"content":{"rendered":"
\n
\n
\n

git \u4e34\u65f6\u4fee\u6539 bug \u8981\u600e\u4e48\u521b\u5efa\u5206\u652f <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/i> 3<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n

\u524d\u63d0\uff1a\u73b0\u5728\u6709 dev\uff0ctest\uff0cmaster \u5206\u652f\u3002\u6d4b\u8bd5\u5206\u652f\u6b64\u65f6\u53d1\u73b0\u4e86\u4e00\u4e2a bug\uff0c\u4f46\u662f\u5f53\u524d\u6709\u5f00\u53d1\u4efb\u52a1\u5728 dev \u5206\u652f\u4e0a\u9762\uff0c\u4e0d\u60f3\u63d0\u4ea4 dev \u7684\u4ee3\u7801\u3002<\/p>\n

\u662f\u4e0d\u662f\u53ef\u4ee5\u8fd9\u6837\u5904\u7406\uff1a\u5728 test \u4e0a\u9762\u62c9\u4e00 test-bug \u4e2a\u5206\u652f\uff0c\u5728 test-bug \u5206\u652f\u4e0a\u9762\u4fee\u6539\u5b8c\u4e4b\u540e\uff0c\u5408\u5e76\u5230 test \u5206\u652f\u3002 \u4f46\u662f\u6709\u4e2a\u7591\u60d1\uff0c\u6b64\u65f6 dev \u5206\u652f\u80af\u5b9a\u4e5f\u662f\u6709 bug \u7684\u3002\u8fd9\u4e2a\u65f6\u5019\u6211\u5e94\u8be5\u628a test-bug \u5206\u652f\u6539\u5b8c\u7684\u4ee3\u7801\u5408\u5e76\u5230 dev \u8fd8\u662f\u4ece test \u5206\u652f\u62c9\u4ee3\u7801\u56de\u6765\uff1f\u5982\u679c\u4ece merge test-bug into dev,\u518d merge dev into test\uff0c\u4e0d\u5c31\u76f8\u5f53\u4e8e bug \u63d0\u4ea4\u4e86\u4e24\u904d\u5417\uff1f<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (38<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : phpfpm <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4f60\u8981\u4fee\u590d\u5230\u54ea\u4e2a\u5206\u652f\uff0c\u5c31\u4ece\u54ea\u4e2a\u5206\u652f checkout \u51fa\u6765\u4e00\u4e2a\u65b0\u7684\u4fee\u590d\u5206\u652f\u3002<\/p>\n

    \u5982\u679c\u8fd9\u4e2a bug \u5f71\u54cd\u5230\u4e86\u4f60\u7684 dev \u7684\u5f00\u53d1\uff0c\u90a3\u4e48\u4f60\u5728\u63d0\u4ea4\u6d4b\u8bd5\u5b8c test-bug \u5206\u652f\u4e14\u5408\u5e76\u5230 test \u4e4b\u540e\uff0cdev \u5408\u5e76 test \u5206\u652f\u4ee5\u4fee\u590d\u8fd9\u4e2a bug
    \u5982\u679c\u4e0d\u5f71\u54cd\uff0c\u5c31\u653e\u90a3\u5427<\/p>\n

    \u4e0d\u8981\u76f4\u63a5\u5408\u5e76 test-bug \u8fdb dev\uff0c\u867d\u7136\u4e0d\u4f1a\u63d0\u4ea4\u4e24\u904d\uff08\u53c2\u89c1 git \u539f\u7406\uff09
    \u4f46\u662f\u4f1a\u5bfc\u81f4\u540c\u4e00\u4e2a\u63d0\u4ea4\u6709\u4e24\u4e2a\u63d0\u4ea4\u8bb0\u5f55\u3002<\/p>\n

    \u8bb0\u4f4f\uff0c\u4f60\u7684 dev \u6c38\u8fdc\u53ea follow \u4e00\u4e2a\u5206\u652f\u51c6\u6ca1\u9519\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Lonersun <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u60a8\u53ef\u4ee5\u53c2\u8003\u4e0b git flow \u7684\u6d41\u7a0b https:\/\/danielkummer.github.io\/git-flow-cheatsheet\/index.zh_CN.html <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : leonardyang <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u4eec\u4ee5\u524d\u7684\u7248\u672c\u63a7\u5236\u66f4\u590d\u6742\u4e00\u4e9b\uff0c\u9664\u4e86\u4f60\u8bf4\u7684\u4e09\u4e2a\u5206\u652f\u4ee5\u5916\u6bcf\u6b21\u5f00\u53d1\u63d0\u7684\u6b63\u5f0f\u9700\u6c42\u8981\u4ece master checkout \u5bf9\u5e94\u7684 feature \u5206\u652f\uff0c\u5f00\u53d1\u540e\u518d\u5408\u5e76\u5230 dev->test \u63d0\u6d4b\uff0c\u7136\u540e\u4f60\u8bf4\u7684\u8fd9\u79cd\u60c5\u51b5\u5c31\u4f1a\u5728 dev \u5206\u652f\u4fee\u6539 bug \u63d0\u4ea4\uff0c\u518d\u5408\u5e76\u5230 test \u5206\u652f\uff0c\u800c\u5176\u4ed6\u4eba\u6ca1\u5f00\u53d1\u5b8c\u7684\u5219\u8fd8\u5728\u4ed6\u4eec\u7684 feature \u5206\u652f\uff0c\u4e0d\u4f1a\u5f71\u54cd <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @phpfpm \u4f60\u8bf4\u7684\u201cdev \u5408\u5e76\u5230 test \u5206\u652f\u4ee5\u4fee\u590d\u8fd9\u4e2a bug\u201d\uff0c\u610f\u601d\u662f\u5207\u6362\u5230 dev \u5206\u652f\uff0c\u7136\u540e\u4ece test \u5f52\u5e76\u8fc7\u6765\u5417\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : phpfpm <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @luxinfl \uff1f\uff1f\uff1f
    \u591a\u53bb\u770b\u770b 2 \u7ed9\u7684\u6587\u6863\u53c2\u8003\u3002<\/p>\n

    \u5728 dev \u4e0a\u5206\u652f merge test <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @phpfpm \u6211\u662f\u770b\u4e86\u63d0\u4ea4\u8bb0\u5f55\uff0c\u6709\u4e24\u4e2a\u4e00\u6837\u7684\uff0c\u6211\u4ee5\u4e3a\u662f\u91cd\u590d\u63d0\u4ea4\u4e86\u3002\u3002\u3002\u53cd\u6b63\u73b0\u5728\u5408\u5e76\u4ee3\u7801\u7684\u65f6\u5019\uff0c\u7ecf\u5e38\u6709\u5f88\u591a\u4ee5\u524d\u63d0\u8fc7\u7684\u4ee3\u7801\uff0c\u800c\u4e14\u90fd\u662f\u6ca1\u53d8\u5316\u7684\u3002\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @Lonersun \u8c22\u8c22\u8001\u94c1 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : guanerlin <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5982\u679c\u6211\u7406\u89e3\u6ca1\u9519\uff0c\u4f60\u5e94\u8be5 test \u5206\u652f\u62c9\u51fa\u6765 test-bug \u5206\u652f\u4fee\u590d\u540e\uff0ctest-bug \u5408\u5e76\u8fdb test\uff0c\u7136\u540e test \u5206\u652f\u53d1\u7248\u540e(\u751f\u4ea7\u73af\u5883)\u4f1a\u8fdb\u5165 master\uff0cmaster \u4f1a\u8fdb dev\uff0cdev \u5b8c\u6210\u540e\u4f1a\u8fdb test\uff0c\u8fd9\u4e2a\u6d41\u7a0b\u6700\u597d\u662f\u8fd9\u6837\u7684\u4e00\u4e2a\u987a\u52bf\uff1adev->test \uff08 test-bug->test \uff09->master->dev <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @guanerlin \u6211\u4eec\u73b0\u5728\u90fd\u8fd8\u6ca1\u6709\u5230 master \u5206\u652f\u5462\uff0c\u53ea\u662f test \u5206\u652f\u53d1\u73b0\u4e86 bug \u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @phpfpm \u770b\u4e86\u6587\u6863\u4e86\uff0c\u6211\u4eec\u6ca1\u7528 git flow \u3002\u3002\u3002\u6b63\u5e38\u63d0\u4ea4\u7684\u6d41\u7a0b\u90fd\u5dee\u4e0d\u591a <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ferock <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    master \u4e0a\u62c9\u4e00\u4e2a hotfix\/xxx.xxx \u7248\u672c\u7684\u5206\u652f\uff0c\u4fee\u597d\u4e86\u4ee5\u540e\uff0c\u53d1\u5e03
    \u53d1\u5e03\u5b8c\uff0c\u5408\u5e76\u5230 master + develop \u5206\u652f\u3002<\/p>\n

    \u53c2\u8003 git-flow <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : phpfpm <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @luxinfl \u53ef\u4ee5\u4e0d\u7528\uff0c\u4f46\u662f\u8981\u505a\u6b63\u786e\u7684\u4e8b\u60c5\u3002\u3002<\/p>\n

    \u9996\u5148\u4f60\u8981\u7406\u89e3 git <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Kili9 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u4eec\u6d41\u7a0b\u662f develop \u662f\u7528\u6765\u7ebf\u4e0a\u53d1\u5e03\u7684, master \u662f\u7528\u6765\u5b58\u7a33\u5b9a\u7248\u672c\u7684. \u5982\u679c\u9700\u8981\u5f00\u53d1\u4e00\u4e2a\u65b0\u529f\u80fd \u4ece master \u62c9\u4e00\u4e2a\u529f\u80fd\u5f00\u53d1\u5206\u652f: feature-xxxx-yyyyMMdd. \u5f00\u53d1\u5b8c\u6210\u540e\u63d0\u6d4b\u9636\u6bb5\u5408\u5e76\u5230 beta \u5206\u652f, \u63d0\u6d4b\u5b8c\u6210\u540e feature-xxxx-yyyyMMdd \u5206\u652f\u5408\u5e76\u5230 develop \u7528\u6765\u53d1\u7ebf\u4e0a, \u7a33\u5b9a\u540e develop \u518d\u5408\u5230 master \u5b58\u6863. <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : joesonw <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    test-bug \u5408\u5e76\u540e, \u5207\u5230 dev, \u628a\u6539\u52a8 cherrypick \u8fdb\u6765\u76f4\u63a5\u63a8 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : RoshanWu <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    cherry-pick \u662f\u6b63\u89e3\u3002 <\/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
    @phpfpm \u6709\u51e0\u4e2a\u95ee\u9898\u8bf7\u6559\u4e0b
    codereview \u662f\u5728 feature \u5f00\u53d1\u5b8c\u6210\u5408\u5e76\u5230 develop \u5206\u652f\u65f6\u8fdb\u884c\u4e48\uff1f
    release \u5206\u652f\u53ef\u4ee5\u540c\u65f6\u6709\u591a\u4e2a\u4e48\uff1f\uff08\u51e0\u4e2a feature \u5e76\u884c\u5f00\u53d1\u4e0a\u7ebf\uff09
    \u5982\u679c\u4e00\u4e2a\u5927\u7684 feature \u5230 release \u65f6\uff0c\u5728\u6d4b\u8bd5\u671f\u95f4\uff0c\u6709\u522b\u7684\u5e76\u884c\u7684\u5c0f feature \u60f3\u4e0a\u7ebf\u600e\u4e48\u529e\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : LiuJiang <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4ece\u4e3b\u5206\u652f\u4e0a\u5207\u4e00\u4e2a hotfix \u5206\u652f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @joesonw \u7528\u4e86 cherrypick\uff0c\u4f46\u662f\u6211\u53d1\u73b0\u5355\u72ec\u62c9\u4e2a bug \u5206\u652f\uff0c\u597d\u50cf\u4e5f\u4e0d\u600e\u4e48\u5f71\u54cd\u3002\u6709 bug \u5c31\u5728 bug \u5206\u652f\u4e0a\u9762\u6539\uff0cdev \u5206\u652f\u8fd8\u662f\u7167\u5e38\u5f00\u53d1\u3002\u3002\u3002\u6211\u4eec\u53cd\u6b63\u6ca1\u641e\u7684\u592a\u7ec6\u81f4 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : phpfpm <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @newtype0092 <\/p>\n

    1 codereview
    \u672c\u8d28\u4e0a cr \u662f\u8bf4\u4e0d\u8981\u8ba9\u4e0d\u5408\u683c\u7684\u4ee3\u7801\u5f71\u54cd\u5230\u5176\u4ed6\u4eba\uff0c\u6240\u4ee5\u5408\u5e76\u5230\u516c\u5171\u5206\u652f\u5fc5\u987b\u7ecf\u8fc7 cr
    2 release \u5206\u652f\u7684\u4e2a\u6570
    \u4e0d\u884c\uff0c\u4e00\u90e8\u5206\u673a\u5668\u4e0a A \u4e00\u90e8\u5206\u673a\u5668\u4e0a B \u4e48\u3002\u3002\u4e00\u822c\u662f\u68af\u5ea6\u4e0a\u7ebf\uff08\u5c0f\u6d41\u91cf\uff0c\u7070\u5ea6\uff0c\u6bcf\u4e2a\u5c42\u6b21\u6709\u4e13\u95e8\u7684\u5206\u652f\uff09
    3 \u5c0f feature
    \u6211\u4eec\u90fd\u662f release \u5206\u652f\u4e0d\u4f1a\u6301\u7eed\u592a\u4e45\uff08\u5c0f\u6d41\u91cf\u4e5f\u597d\u7070\u5ea6\u4e5f\u597d\u9884\u53d1\u5e03\u4e5f\u597d\u6301\u7eed\u592a\u4e45\u5fc5\u7136\u5bfc\u81f4\u529f\u80fd\u5206\u88c2\uff09
    \u6240\u4ee5\u8981\u4e48\u7b49 release \u6d4b\u5b8c\u518d\u4e0a\uff08\u4e00\u822c\u7684\uff0crealease \u6b63\u5728\u88ab\u7528\u7740\u7684\u65f6\u5019\u4e0d\u5141\u8bb8\u5176\u4ed6\u9700\u6c42\u5408\u5e76\u5230 release \uff09
    \u8981\u4e48\uff0c\u540e\u4e0a\u7684\u60f3\u4e0a\u7ebf\u5148\u4e0a\u7684\u8fd8\u6ca1 ready \u600e\u4e48\u529e
    \u6216\u8005\u7ebf\u4e0a\u7684\u60f3\u4e0a\u7ebf\u540e\u4e0a\u7684\u8fd8\u6ca1 ready \u53c8\u8be5\u600e\u4e48\u529e
    \u4e0d\u5408\u5e76\u7684\u81ea\u7531\u5ea6\u9ad8\u4e00\u4e9b\u3002<\/p>\n

    \u7d27\u6025\u4fee\u590d\u76f4\u63a5\u4e0a master \u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : faceRollingKB <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u89c9\u5f97\u9700\u8981\u4ece dev \u5206\u652f\u62c9\u4e00\u4e2a\u65b0\u7684 bug \u5206\u652f\u6765\u5904\u7406\uff0c\u6bd5\u7adf\u8fd9\u4e2a bug \u8ddf test \u5206\u652f\u7684\u4efb\u52a1\u662f\u65e0\u5173\u7684\uff0c\u6700\u7ec8\u5408\u5e76\u5206\u652f\u65f6\u53ef\u4ee5\u76f4\u63a5\u5408\u5e76\u5230 dev \u4e5f\u53ef\u4ee5\u5148\u5408\u5e76\u5230 test \u518d\u5408\u5e76\u5230 dev\uff0c\u8fd9\u6837\u66f4\u7075\u6d3b <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : faceRollingKB <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u628a test \u3001dev \u641e\u53cd\u4e86\uff0c\u4f60\u8bf4\u7684\u65b9\u5f0f\u662f\u5bf9\u7684\uff0cbug \u6ca1\u6709\u88ab\u63d0\u4ea4\u4e24\u904d\uff0c\u6700\u7ec8\u7684 commit history \u4e2d\u53ea\u6709\u4e00\u4e2a commit \u8ddf bug \u76f8\u5173\uff0c\u5176\u4ed6\u7684\u90fd\u53ea\u662f dev \u7684 commit\uff0c\u6240\u4ee5\u6ca1\u5173\u7cfb <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : railgun <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    test \u5207\u51fa bugfix \u5206\u652f\uff0c\u6539\u5b8c\u540e\u5408\u5e76\u56de test\uff0c\u518d merge test \u5230 dev <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : faceRollingKB <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u53ef\u4ee5\u770b\u4e0b\u6587\u6863 https:\/\/git-scm.com\/book\/en\/v2\/Git-Branching-Basic-Branching-and-Merging<\/p>\n

    \u5206\u652f\u53ea\u662f commit history \u4e2d\u67d0\u4e2a commit \u7684\u5f15\u7528\uff0c\u8ddf svn \u7684\u65b9\u5f0f\u4e0d\u4e00\u6837\u7684 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : orzorzorzorz <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e00\u822c\u54ea\u91cc\u6709 bug \u5c31\u6539\u54ea\u91cc\u3002\u5982\u679c\u60f3\u907f\u5f00\u63d0\u4ea4\u8bb0\u5f55\u7684\u91cd\u590d\uff0c\u53ef\u4ee5\u4ece dev checkout \u51fa\u53bb\uff0c\u6539\u5b8c squash \u8fdb dev\uff0c\u7136\u540e merge \u8fdb test\uff0c\u8fd9\u6837\u770b\u4e0a\u53bb\u4f1a\u6e05\u6670\u4e00\u4e9b\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : admin7785 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    dev:git stash
    dev:git checkout test
    test:git checkout -b test-bug
    test-bug:git push
    test-bug:git checkout test
    test:git merge test-bug
    test:git checkout dev
    dev:git merge test<\/p>\n

    \u5982\u679c\u54ea\u4e00\u6b65\u4e0d\u5bf9\uff0c\u8fd8\u8bf7\u6307\u6b63 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : mritd <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u9075\u5faa gitflow \u5427 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : yizmaoaa <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u63d0\u4ea4\u5230 dev\uff0c\u7136\u540e cherry pick \u5230 test <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : cco <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4ece\u6709 bug \u7684\u5206\u652f checkout \u51fa\u6765\u4e00\u4e2a hostfix\/xxxx \u7684\u5206\u652f\uff0c\u4fee\u6539\u63d0\u6d4b\u6ca1\u95ee\u9898\u5408\u5e76\u5230\u8be5\u5206\u652f\u4ee5\u53ca\u57fa\u4e8e\u8be5\u5206\u652f\u7684\u5176\u4ed6\u5206\u652f\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : guanerlin <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @ferock \u5728\u6d4b\u8bd5\u9636\u6bb5\u53d1\u73b0\u7684 bug \u662f bugfix <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : guanerlin <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @luxinfl \u6211\u7684\u610f\u601d\u662f\uff0c\u6d41\u7a0b\u662f\u8fd9\u6837\uff0c\u6240\u4ee5\u4f60\u4e0d\u8981\u8003\u8651\u8fd9\u4e2a\u5206\u652f\u5f80 dev \u6d41\u52a8 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @admin7785 \u989d\uff0c\u6700\u540e\u4e00\u6b65\u548c\u4f60\u4e0d\u592a\u4e00\u6837\uff0c\u6211\u662f dev:git merge test-bug <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @faceRollingKB \u6700\u540e\u4ece dev \u5408\u5230 test \u7684\u65f6\u5019\uff0c\u4f1a\u6709 test-bug \u5408\u5230 dev \u7684\u8bb0\u5f55\u3002\u3002\u6211\u8bb0\u5f97\u662f\u8fd9\u6837\u7684 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @faceRollingKB \u770b\u4e86\u4e00\u4e0b\uff0c\u53d1\u73b0\u5176\u5b9e test-bug \u5206\u652f\u4e0d\u9700\u8981\u53bb\u5408\u5230 dev \u91cc\u9762\uff0cdev \u5f00\u53d1\u5b8c\u76f4\u63a5\u5408\u8fc7\u53bb\uff0c\u6709\u51b2\u7a81\u89e3\u51b3\u51b2\u7a81\u5c31\u884c\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @admin7785 \u6211\u770b\u4e86 git \u6587\u6863\uff0c\u597d\u50cf\u4e0d\u9700\u8981\u5427 test-bug \u5408\u5e76\u5230 dev \u5206\u652f\uff0cdev \u6539\u5b8c\u4e4b\u540e\uff0c\u76f4\u63a5\u5408\u5230 test \u5c31\u884c\u4e86\u3002\u7136\u540e\u53ef\u4ee5\u62c9\u65b0\u7684 dev \u5206\u652f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : faceRollingKB <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @luxinfl \u6700\u540e\u5408\u5e76\u4e09\u4e2a\u5206\u652f dev \u3001test \u3001bug \u65e0\u8bba\u4ec0\u4e48\u987a\u5e8f\u7ed3\u679c\u90fd\u662f\u4e00\u6837\u7684\uff0c\u4f60\u90fd\u9700\u8981\u5904\u7406 3 \uff5e 4 \u6b21 merge\uff0c\u4e00\u6b21\u89e3\u51b3 conflict\uff0c\u53e6\u5916\u51e0\u6b21 fastforward \u4fee\u6539 pointer(\u540c\u6b65\u5206\u652f\u5f15\u7528)\uff0c\u6ca1\u6709\u62c9\u65b0 dev \u5206\u652f\u7684\u5fc5\u8981 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : index90 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4f60\u8fd9\u79cd\u60c5\u51b5\u5c5e\u4e8e\u4e3b\u5e72\u5f00\u53d1\uff0c\u5206\u652f\u53d1\u5e03\u3002
    \u53d1\u5e03\u5206\u652f\u4e0a\u53d1\u73b0\u4e86 bug\uff0c\u5728\u53d1\u5e03\u5206\u652f\u4e0a\u4fee\u590d\uff0c\u5e76\u9074\u9009\u5230\u4e3b\u5e72\u4e0a\u3002
    #33 \u6709 conflict \u5e94\u8be5\u5c3d\u65e9\u5904\u7406\uff0c\u7b49\u4f60\u8fc7\u4e86\u51e0\u4e2a\u661f\u671f\u5f00\u53d1\u5b8c dev \u5206\u652f\uff0c\u4f30\u8ba1\u90fd\u5fd8\u4e86\u90a3\u4e2a test-bug \u4e86\u3002<\/p>\n

    \u524d\u9762\u6709\u4eba\u63d0\u5230 git flow\uff0c\u5176\u5b9e\u4f60\u7684 test \u5206\u652f\u76f8\u5f53\u4e8e\u7ebf\u4e0a\u5206\u652f\uff0c\u4ee5\u8fd9\u6837\u7684\u89c6\u89d2\u53c2\u8003 git flow \u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : admin7785 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @luxinfl #34 \u4f46\u662f\u4e0d\u5e94\u8be5\u662f\u7acb\u5373\u5207\u4e2a test-bug \u51fa\u6765\u89e3\u51b3 bug \u5417\uff0c\u89e3\u51b3\u5b8c\u4e4b\u540e\u8fd8\u8981\u5728 dev \u505a\u7b2c\u4e8c\u6b21\u4fee\u6539\u5417\uff1f<\/p>\n

    \u770b\u4e86\u4f60 33 \u7684\u56de\u590d\uff0c\u5e94\u8be5\u662f\u6ca1\u95ee\u9898\u7684\uff0c\u5408\u5e76\u7684\u65f6\u5019\u89e3\u51b3\u51b2\u7a81\u5c31\u884c\uff0c\u6700\u540e\u4e00\u6b65\u5408\u5230 dev\uff0c\u53ef\u4ee5\u907f\u514d\u89e3\u51b3\u51b2\u7a81\u8fd9\u4e00\u6b65\uff0c\u90fd\u5dee\u4e0d\u591a\uff0c\u6211\u65e5\u5e38\u4e2d\u4f1a\u9009\u62e9\u5408\u5e76\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : luxinfl <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @admin7785 \u53cd\u6b63\u516c\u53f8\u4e5f\u6ca1\u4eba\u4f1a\u5173\u6ce8\u63d0\u4ea4\u65e5\u5fd7\u4ec0\u4e48\u7684\uff0c\u73b0\u5728 bug \u5206\u652f\u5c31\u4e24\u5934\u5408\uff0c\u65e0\u6240\u8c13\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    git \u4e34\u65f6\u4fee\u6539 bug \u8981\u600e\u4e48\u521b…<\/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\/137859"}],"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=137859"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/137859\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=137859"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=137859"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=137859"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}