{"id":382973,"date":"2021-03-11T06:42:37","date_gmt":"2021-03-10T22:42:37","guid":{"rendered":"http:\/\/4563.org\/?p=382973"},"modified":"2021-03-11T06:42:37","modified_gmt":"2021-03-10T22:42:37","slug":"git-%e4%b8%a4%e4%b8%aa%e5%88%86%e6%94%af%e5%90%88%e5%b9%b6%e7%9a%84%e6%97%b6%e5%80%99%ef%bc%8c%e5%a6%82%e4%bd%95%e4%bf%9d%e8%af%81%e4%bb%a3%e7%a0%81%e8%bf%90%e8%a1%8c%e6%ad%a3%e5%b8%b8%ef%bc%9f","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=382973","title":{"rendered":"git \u4e24\u4e2a\u5206\u652f\u5408\u5e76\u7684\u65f6\u5019\uff0c\u5982\u4f55\u4fdd\u8bc1\u4ee3\u7801\u8fd0\u884c\u6b63\u5e38\uff1f"},"content":{"rendered":"
\n
\n
\n

git \u4e24\u4e2a\u5206\u652f\u5408\u5e76\u7684\u65f6\u5019\uff0c\u5982\u4f55\u4fdd\u8bc1\u4ee3\u7801\u8fd0\u884c\u6b63\u5e38\uff1f <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : sugarkeek <\/span> <\/i> 6<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
\u6bd4\u5982\u8bf4 M \u548c B \u5206\u652f\uff0cB \u57fa\u4e8e M \u65b0\u5efa\u91cc\u4e00\u4e2a\u5206\u652f\uff0cM \u548c B \u5404\u81ea\u5f00\u53d1\u7740\u4e0d\u540c\u7684\u6a21\u5757\u3002\u6709\u51e0\u4e2a\u95ee\u9898\uff1a<\/p>\n

1. M \u548c B \u7684\u867d\u7136\u5728\u5f00\u53d1\u4e0d\u540c\u7684\u6a21\u5757\uff0c\u4f46\u662f\u53ef\u80fd\u4f1a\u52a8\u5230\u540c\u4e00\u6a21\u5757\u7684\u5730\u65b9\uff0c\u6bd4\u5982\u8bf4\u914d\u7f6e\uff0c\u90a3\u4e48\u5408\u5e76\u7684\u65f6\u5019\u4e0d\u4ec5\u662f\u8bf4\u5408\u5e76\u4e0d\u540c\u7684\u6a21\u5757\uff0c\u8fd8\u5f97\u89e3\u51b3\u540c\u4e00\u6a21\u5757\u51b2\u7a81\u7684\u5730\u65b9\u3002<\/p>\n

2. git \u662f\u6709\u51b2\u7a81\u5bf9\u6bd4\u7684\uff0c\u5305\u62ec\u7528\u7684 GUI \u8f6f\u4ef6\u90fd\u6709\u975e\u5e38\u76f4\u89c2\u7684\u51b2\u7a81\u5bf9\u6bd4\uff0c\u901a\u8fc7\u51e0\u6b21\u5408\u5e76\u53d1\u73b0\u4e86\u4e00\u4e9b\u95ee\u9898\uff0cgit \u662f\u80fd\u89e3\u51b3\u6587\u672c\u51b2\u7a81\u7684\u5bf9\u6bd4\uff0c\u4f46\u662f\u5230\u4e86\u4ee3\u7801\u8fd0\u884c\u65f6\uff0c\u6709\u65f6\u4e5f\u4f1a\u51fa\u9519\uff0c\u5373\u4f7f\u6211\u4eec\u89c9\u5f97\u67d0\u4e2a\u5730\u65b9\u51b2\u7a81\u4e86\uff0c\u91c7\u7528\u54ea\u65b9\u7684\u4ee3\u7801\u624d\u662f\u6b63\u786e\u7684\u3002<\/p>\n

\u4f46\u662f\u7a0b\u5e8f\u4e0d\u80fd\u8bf4\u6709\u65f6\u51fa\u9519\u554a\uff0c\u6240\u4ee5\u4ee3\u7801\u5728\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u5fc3\u4e2d\u603b\u662f\u6709\u79cd\u9690\u9690\u7684\u62c5\u5fc3\u5408\u5e76\u7684\u4ee3\u7801\u4f1a\u51fa\u73b0\u95ee\u9898\u3002git \u5f88\u5f3a\u5927\uff0c\u5e2e\u52a9\u6211\u4eec\u7ba1\u7406\u5927\u91cf\u7684\u4ee3\u7801\uff0c\u4f46\u662f\u5c31\u597d\u50cf\u6d77\u4e0b\u7684\u51b0\u5c71\u4e00\u6837\uff0c\u5f88\u591a\u4e1c\u897f\u6211\u4eec\u90fd\u65e0\u6cd5\u9884\u6599\u7684\u5230\u3002<\/p>\n

3. \u603b\u7ed3\u4e00\u4e0b\u5c31\u662f\uff0cgit \u80fd\u89e3\u51b3\u4ee3\u7801\u4e0d\u540c\uff0c\u4f46\u662f\u4e0d\u80fd\u4fdd\u8bc1\u5408\u5e76\u7684\u4ee3\u7801\u6b63\u5e38\u8fd0\u884c\u3002<\/p>\n

\u987a\u4fbf\u518d\u5410\u69fd\u4e00\u4e0b Jetbrains \u5bb6\u4e4b\u524d\u7684 git \u7684\u672c\u5730\u5305 rebase \u7684\u7ffb\u8bd1\uff08\u73b0\u5728\u5fd8\u8bb0\u600e\u4e48\u7ffb\u8bd1\u7684\u4e86\uff0c\u884d\u5165\u8fd8\u662f\u5408\u5e76\u597d\u50cf\uff0c\u53cd\u6b63\u5bb9\u6613\u641e\u6df7\uff09\uff0c\u4e00\u65f6\u548c merge \u641e\u6df7\uff0c\u70b9\u4e86\u4e4b\u540e\u624d\u53d1\u73b0\u662f rebase\uff0c\u6094\u6068\u4ea4\u52a0\uff0c\u540e\u9762\u6362\u56de\u82f1\u6587\u7248\u4e86\u3002\u4e0d\u8fc7\u5728\u5176\u4ed6\u975e\u4e3b\u529b\u7684\u8f6f\u4ef6\u5982 webstorm \u672c\u5730\u5305\u8fd8\u6ca1\u5378\u8f7d\uff0c\u66f4\u65b0\u4e86\u6700\u65b0\u7248\u4e4b\u540e\u770b\u4e86\u770b rebase \u5355\u8bcd\u6362\u56de\u82f1\u6587\u6765\u3002\u6240\u4ee5\u8bf4\u4e00\u4e2a\u4fe1\u8fbe\u96c5\u7684\u7ffb\u8bd1\u786e\u5b9e\u5f88\u96be\u554a\u3002 <\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (39<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : wednesdayco <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u8c01\u5408\u5e76,\u8c01\u89e3\u51b3\u51b2\u7a81\u5427\u2026\u2026\u770b\u770b git flow \u89c4\u8303? <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : baiyi <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git \u89e3\u51b3\u7684\u5c31\u662f\u4ee3\u7801\u51b2\u7a81\uff0c\u4f60\u9700\u8981\u7684\u662f\u6301\u7eed\u96c6\u6210\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : imdong <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6d4b\u8bd5\u8ddf\u4e0a,\u611f\u89c9\u5199\u6d4b\u8bd5\u6bd4\u5199\u4ee3\u7801\u8fd8\u96be,\u5de5\u4f5c\u91cf\u4e5f\u5f88\u5927.<\/p>\n

    \u4f46\u662f\u53ef\u4ee5\u6709\u6548\u51cf\u5c11\u4e3b\u7684\u95ee\u9898. <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : yanqiyu <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git \u53ea\u662f\u5728\u6587\u672c\u5c42\u9762\u5904\u7406\u4ee3\u7801\uff0c\u5b83\u7ba1\u4e0d\u5230\u4ee3\u7801\u91cc\u9762\u7684\u903b\u8f91\uff0c\u4f60\u9700\u8981\u7684\u662f\u6d4b\u8bd5\u7528\u4f8b <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : teddy2725 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6d4b\u8bd5\u8986\u76d6\u591f\u4e86\u5c31\u6ca1\u4e8b\uff0c\u5355\u5143\u6d4b\u8bd5\uff0c\u529f\u80fd\u6d4b\u8bd5\uff0c\u96c6\u6210\u6d4b\u8bd5\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : no1xsyzy <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6d4b\u8bd5
    \u6709\u65f6\u4f1a\u6ce8\u610f\u5230\u6301\u7eed\u96c6\u6210\uff0c\u4e3b\u8981\u662f\u6d4b\u8bd5\u901a\u5e38\u662f\u96c6\u6210\u7684\u4e00\u73af<\/p>\n

    \u8fd8\u6709\u4e00\u65b9\u9762\uff0c\u5c31\u662f\uff08\u5c3d\u91cf\uff09\u4e0d\u8981\u4e24\u4e2a\u4eba\u540c\u65f6\u52a8\u4e00\u7247\u903b\u8f91\u3002
    \u6700\u7cdf\u7cd5\u7684\u5c31\u662f\u4e00\u4e2a\u4eba\u4e3a\u67d0\u4e2a\u65b9\u6cd5\u6dfb\u52a0\u4e86\u65b0\u7684\u7279\u6027\uff0c\u53e6\u4e00\u4e2a\u4eba\u91cd\u6784\u4e86\u8fd9\u4e2a\u65b9\u6cd5\u2026\u2026 \u90a3\u51e0\u4e4e\u5fc5\u6709\u4e00\u4e2a\u4eba\u6253\u56de\u91cd\u505a\u3002
    \u5f00\u6e90\u7684\u81ea\u7ec4\u7ec7\u7ed3\u6784\u6765\u8bf4\uff0c\u591a\u534a\u4f1a\u5148\u63d0 issue \u6765\u5ba3\u544a\u81ea\u5df1\u5728\u52a8\u8fd9\u5757\u3002<\/p>\n

    \u8fd9\u4e2a\u7ffb\u8bd1\u786e\u5b9e\u6709\u95ee\u9898\uff0cgit rebase \u5e94\u5f53\u4f5c\u4e3a\u672f\u8bed\u4e0d\u7ffb\u8bd1\u3002
    \u201c\u53d8\u57fa\u201d \u8fd9\u4e2a\u7ffb\u8bd1\u4e5f\u4e0d\u591f\u7262\u9760\uff0c\u800c\u4e14\u4f5c\u4e3a\u4e2d\u6587\u4e5f\u5f88\u602a\u5f02\u3002
    \u4e0d\u8fc7\u8fd9\u4e2d\u82f1\u6587\u6df7\u6742\u2026\u2026 \u5927\u5218\u76f4\u547c\u5185\u884c\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : TuringGunner <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u540e\u5408\u5e76\u7684\u8d1f\u8d23 rebase \u89e3\u51b3\u51b2\u7a81\uff0c\u7136\u540e\u628a\u6d4b\u8bd5\u518d\u8dd1\u4e00\u904d <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Chenamy2017 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u8fd9\u548c git \u6ca1\u6709\u5173\u7cfb\uff0c\u52a8\u4e86\u4ee3\u7801\u5c31\u8981\u6d4b\u8bd5\uff0c\u4e0d\u7ba1\u662f\u4eba\u5de5\u4fee\u6539\u7684\u8fd8\u662f git \u81ea\u52a8\u89e3\u51b3\u51b2\u7a81\u7684\u3002 <\/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
    \u5f53\u7136\u9760\u96c6\u6210\u6d4b\u8bd5\u4e86\u3002\u4e24\u4e2a\u5206\u652f\u5408\u5e76\u4ea7\u751f\u51b2\u7a81\u7684\u8bdd\uff0c\u4e0d\u7ba1\u662f\u53d6\u5176\u4e2d\u4e00\u4e2a\u5206\u652f\u7684\u4ee3\u7801\uff0c\u8fd8\u662f\u628a\u4e24\u4e2a\u5206\u652f\u7684\u4fee\u6539\u5408\u5e76\u5728\u4e00\u8d77\uff0c\u90fd\u6709\u53ef\u80fd\u5bfc\u81f4\u4ee3\u7801\u51fa\u95ee\u9898\u3002<\/p>\n

    \u7b80\u5355\u8bf4\u5c31\u662f\u540e\u5408\u5e76\u7684\u5206\u652f\u9700\u8981\u91cd\u505a\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : soulmt <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git \u53ea\u8d1f\u8d23\u51b2\u7a81\uff0c\u4e0d\u8d1f\u8d23\u4ee3\u7801\u80fd\u4e0d\u80fd\u8dd1\u8d77\u6765\uff0c\u6240\u4ee5\u5408\u5e76\u53ea\u662f\u53d1\u5e03\u7684\u7b2c\u4e00\u6b65\uff0c\u5e94\u8be5\u6709\u6d4b\u8bd5\u56de\u5f52\u6d4b\u8bd5\u8fd9\u4e00\u73af\u8282\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : crclz <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u65b0\u5efa\u4e00\u4e2a\u4e34\u65f6\u5206\u652f\u7528\u4e8e\uff1a1. \u5408\u5e76\u51b2\u7a81 2. \u8fd0\u884c\u5355\u5143\u6d4b\u8bd5\u3001\u5404\u79cd\u6d4b\u8bd5
    \u6d4b\u8bd5\u901a\u8fc7\u540e\uff0c\u5c06\u8be5\u5206\u652f\u5e76\u5165 master \u5206\u652f\u3002\u5982\u679c\u9700\u8981\u90e8\u7f72\uff0c\u5c31\u5c06 master \u5206\u652f\u5e76\u5165 release \u5206\u652f\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : fucUup <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u4eec\u7684\u5f00\u6e90\u9879\u76ee, \u5168\u7403\u6709 2 \u4e07\u4e2a git \u8d26\u6237\u5728\u5168\u7403 7*24 \u534f\u4f5c, \u6ca1\u6709\u4f60\u7684\u7cdf\u5fc3\u4e8b, \u90fd\u662f\u6c34\u5e73\u95ee\u9898, \u5408\u5e76\u7684\u5730\u65b9\u8be5\u662f true \u8fd8\u662f false, \u4f60\u5fc3\u91cc\u6ca1\u6709\u4e00\u70b9 B***** <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : BeautifulSoap <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u516c\u53f8\u7684\u4e00\u4e2a\u9879\u76ee\uff0c\u63d0 pr \u4f1a\u7528 github actions \u81ea\u52a8\u8fdb\u884c\u5355\u5143\u6d4b\u8bd5\uff0c\u4e0d\u901a\u8fc7\u76f4\u63a5\u6253\u56de\uff0c\u540c\u65f6\u8fd8\u4f1a\u5bf9\u63d0\u4ea4\u7684\u4ee3\u7801\u8fdb\u884c linter \u68c0\u67e5\uff0c\u4e0d\u5408\u89c4\u8303\u4e5f\u662f\u6253\u56de\uff0c\u5e76\u4e14\u8981\u6c42\u63d0\u4ea4\u7684 pr \u7ec6\u7c92\u5ea6\u5fc5\u987b\u5c0f\u3002\u4f46\u95ee\u9898\u662f\uff0cpr \u5c0f\u7ec6\u7c92\u5ea6\u548c\u5355\u5143\u6d4b\u8bd5\u5fc5\u987b\u901a\u8fc7\u7ecf\u5e38\u662f\u51b2\u7a81\u7684\uff0c\u611f\u89c9\u4e00\u4e2a\u529f\u80fd\u5b8c\u6210\u5e76\u5408\u5e76\u9700\u8981\u7684\u65f6\u95f4\u6210\u500d\u589e\u957f<\/p>\n

    \u4e0d\u8fc7\u6709\u5f97\u5fc5\u6709\u5931\uff0c\u4f5c\u4e3a\u9879\u76ee\u6765\u8bf4\u8fd9\u4e48\u505a\u7684\u786e\u662f\u6709\u597d\u5904\u7684 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : fucUup <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @BeautifulSoap en???? \u610f\u601d\u5c31\u662f\u8bf4\u5c0f\u9897\u7c92\u5ea6\u4f1a break \u4ee3\u7801??? \u8fd9\u4e0d\u5408\u7406. \u662f\u4eba\u7684\u95ee\u9898. <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : sugarkeek <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @wednesdayco
    @TuringGunner
    @msg7086
    \u597d\uff0c\u4f1a\u5c1d\u8bd5\u8fd0\u7528\u8fd9\u79cd\u601d\u60f3\u5728\u9879\u76ee\u5b9e\u8df5\u91cc\uff0c\u6211\u53bb\u5b66\u4e60\u5b66\u4e60 git flow<\/p>\n

    @imdong
    @teddy2725
    @Chenamy2017
    @soulmt
    \u6d4b\u8bd5\u786e\u5b9e\u5f88\u91cd\u8981\u554a\uff0c\u4e5f\u5728\u60f3\u529e\u6cd5\u63d0\u9ad8\u6d4b\u8bd5\u7684\u6548\u7387<\/p>\n

    @baiyi \u4e5f\u662f\u5728\u8ffd\u6c42\u8fd9\u79cd\u5de5\u4f5c\u6d41<\/p>\n

    @yanqiyu \u55ef\u55ef\uff0c\u770b\u6765\u4e5f\u53ea\u80fd\u5728\u6d4b\u8bd5\u4e0a\u4e0b\u529f\u592b<\/p>\n

    @no1xsyzy \u8c22\u8c22\u670b\u53cb\u7684\u8010\u5fc3\u6307\u6559\uff0c\u5728\u6d4b\u8bd5\u4e0a\u591a\u4e0b\u529f\u592b\u3002<\/p>\n

    @crclz \u8c22\u8c22\u670b\u53cb\u8fd9\u79cd\u65b0\u601d\u8def<\/p>\n

    @fucUup \u76f8\u4fe1 git \u7684\u6f5c\u529b\uff0c\u6211\u786e\u5b9e\u6c34\u5e73\u8fd8\u6709\u63d0\u5347\u7684\u7a7a\u95f4\uff0c\u90fd\u662f\u73b0\u5b66\u73b0\u7528\u3002<\/p>\n

    @BeautifulSoap \u611f\u8c22\u5206\u4eab git \u5728\u516c\u53f8\u4e2d\u7684\u5b9e\u8df5\uff0c\u6211\u4e5f\u662f\u60f3 git \u5e2e\u52a9\u9879\u76ee\u66f4\u597d\u7684\u8fdb\u884c\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : jxlwqq <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git \u5206\u652f\u5408\u5e76\u7684\u539f\u5219\u662f\uff1a\u201c\u4ece\u54ea\u6765\uff0c\u56de\u54ea\u53bb\u201d\u3002
    \u4ee3\u7801\u662f\u5426\u6b63\u5e38\u8fd0\u884c\u7684\u95ee\u9898\uff0c\u5c31\u9700\u8981\u5355\u5143\u6d4b\u8bd5\u8986\u76d6\u4e86\u3002\u53ea\u8981\u5355\u5143\u6d4b\u8bd5+code review \u6ca1\u95ee\u9898\uff0c\u5c31\u53ef\u4ee5\u5408\u5e76\u3002\u81f3\u4e8e\u529f\u80fd\u6027\u7684\u6d4b\u8bd5\u6216\u8005\u5176\u4ed6\u5916\u90e8\u6d4b\u8bd5\uff0c\u5c31\u9700\u8981\u4f5c\u4e3a\u6d4b\u8bd5\u89d2\u8272\u7684\u4eba\u6765\u505a\u4e86\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : lizytalk <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5355\u5143\u6d4b\u8bd5 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : yogogo <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    M \u548c B \u7684\u867d\u7136\u5728\u5f00\u53d1\u4e0d\u540c\u7684\u6a21\u5757\uff0c\u4f46\u662f\u53ef\u80fd\u4f1a\u52a8\u5230\u540c\u4e00\u6a21\u5757\u7684\u5730\u65b9\uff0c\u6bd4\u5982\u8bf4\u914d\u7f6e\uff0c\u90a3\u4e48\u5408\u5e76\u7684\u65f6\u5019\u4e0d\u4ec5\u662f\u8bf4\u5408\u5e76\u4e0d\u540c\u7684\u6a21\u5757\uff0c\u8fd8\u5f97\u89e3\u51b3\u540c\u4e00\u6a21\u5757\u51b2\u7a81\u7684\u5730\u65b9\u3002
    ——————————————
    \u8fd9\u6837\u5206\u652f\u662f\u4e0d\u662f\u592a\u6df7\u4e71\u4e86\uff0c\u8981\u662f\u6bcf\u4e2a\u5f00\u53d1\u4eba\u5458\u4e00\u4e2a\u5206\u652f\uff0c\u90a3\u5408\u5e76\u4e0d\u5f97\u8981\u51fa\u5927\u4e8b\u3002\u4e0d\u662f\u5e94\u8be5\u8981\u6309\u5f00\u53d1\u7248\u672c\u505a\u5206\u652f\u5417\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : hantsy <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4efb\u4f55\u5408\u5e76\u5230 Master \u76f4\u63a5\u8dd1 CI \u6d4b\u8bd5\u5c31\u5b8c\u4e86\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : hackape <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u8fd9\u4e8b\u513f\u7684\u672c\u8d28\u8ddf git \u6ca1\u6709\u4efb\u4f55\u5173\u7cfb\u3002<\/p>\n

    \u5373\u4fbf\u662f\u4e0d\u5206\u53c9\u3001\u7ebf\u6027\u5730\u53bb\u5f00\u53d1\uff0c\u60f3\u8c61\u4e00\u4e0b\u5f20\u4e09\u5f00\u53d1 A \u6a21\u5757\uff0c\u6539\u4e86\u901a\u7528\u670d\u52a1 C\uff0c\u63d0\u4ea4\u5b8c\u4e86\uff0c\u7136\u540e\u674e\u56db\u63a5\u7740\u5f00\u53d1 B \u6a21\u5757\uff0c\u7136\u540e\u4e5f\u6539\u4e86\u670d\u52a1 C \u3002\u4f60\u770b\u8fd9\u91cc\u9762\u6ca1\u6709\u5206\u53c9\u518d\u5408\u5e76\u3001\u4ea7\u751f\u51b2\u7a81\u7684\u8fc7\u7a0b\uff0c\u4f46\u4e5f\u4e0d\u80fd\u4fdd\u8bc1\u674e\u56db\u6539\u5b8c\u4e86\u7684 C \u5c31\u5b8c\u5168\u4e0d\u51fa\u95ee\u9898\uff0c\u9664\u975e\u674e\u56db\u5145\u5206\u7406\u89e3\u81ea\u5df1\u7684\u6539\u52a8\uff0c\u8fd9\u5305\u62ec\u4ed6\u9700\u8981\u53bb\u770b\u5f20\u4e09\u7684\u90a3\u90e8\u5206\u4ee3\u7801\u3002<\/p>\n

    \u5408\u5e76\u51fa\u73b0\u51b2\u7a81\uff0c\u672c\u8d28\u4e0a\u9762\u5bf9\u7684\u95ee\u9898\u8fd8\u662f\u4e24\u4e2a\u4eba\u5206\u522b\u6539\u4e86\u540c\u4e2a\u4e1c\u897f\u5982\u4f55\u4fdd\u8bc1\u4e0d\u51fa\u9519\uff0c\u8981\u4e48\u662f\u674e\u56db\u89e3\u51b3\u51b2\u7a81\u7684\u65f6\u5019\u597d\u597d\u8bfb\u4ee3\u7801\uff0c\u8981\u4e48\u628a\u5f20\u4e09\u53eb\u8fc7\u6765\uff0c\u5927\u5bb6\u4e00\u8d77 review \u4e00\u4e0b\u3002<\/p>\n

    \u518d\u9000\u4e00\u6b65\u8bb2\uff0c\u54ea\u6015\u53ea\u6709\u5f20\u4e09\u4e00\u4e2a\u4eba\u5199\u4e1c\u897f\uff0c\u7167\u6837\u4e0d\u80fd\u4fdd\u8bc1\u4e0d\u51fa\u9519\uff0c\u76f8\u4fe1\u5927\u5bb6\u90fd\u6709\u8fc7\u770b\u4e0d\u61c2\u81ea\u5df1\u7684\u8001\u4ee3\u7801\u7684\u7ecf\u9a8c\u3002<\/p>\n

    \u6240\u4ee5\u8bf4\u8fd9\u4e8b\u513f\u8ddf git \u6ca1\u6709\u534a\u6bdb\u94b1\u5173\u7cfb\uff0c\u800c\u4f60\u8bf4\u7684\u95ee\u9898\uff0c\u522b\u7684\u5c42\u63d0\u5230\u7684 CI\/CD, TDD \u90fd\u662f\u6709\u6548\u7684\u65b9\u6cd5\uff08\u5982\u679c\u4e0d\u6d41\u4e8e\u5f62\u5f0f\u3001\u597d\u597d\u6267\u884c\u7684\u8bdd\uff09\uff0c\u7136\u800c\u8fd8\u662f\u90a3\u53e5\u8bdd there’s no silver bullet\uff0c\u8fd9\u4e2a\u8bdd\u9898\u6ca1\u6709\u6700\u7ec8\u7b54\u6848\u7684\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : learningman <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u914d\u7f6e\u4e5f\u4e0d\u5e94\u8be5\u653e\u5728 git \u91cc\u5427 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : sillydaddy <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    LZ \u63d0\u7684\u8fd8\u662f\u6bd4\u8f83\u660e\u663e\u7684\u5408\u5e76\u51b2\u7a81\u3002\u8089\u773c\u6bd5\u7adf\u8fd8\u53ef\u4ee5\u68c0\u67e5\u3002<\/p>\n

    \u66f4\u5389\u5bb3\u7684\u662f\uff0c\u6709\u65f6\u5408\u5e76\u4f1a**\u65e0\u58f0\u65e0\u606f**\u5730\u57cb\u4e0b\u9690\u85cf\u7684\u70b8\u5f39\u3002\u6bd4\u5982\u4f7f\u7528 cherry-pick<\/p>\n

    \u6bd4\u5982\u5fae\u8f6f\u7684\u6280\u672f\u6587\u7ae0\u5f88\u8be6\u7ec6\u63cf\u8ff0\u4e86\uff0c\u201cStop cherry-picking, start merging\u201d (\u4e0d\u8981\u4f7f\u7528 cherry-pick\uff0c\u5f00\u59cb\u4f7f\u7528 merge \u5427\uff01)
    https:\/\/devblogs.microsoft.com\/oldnewthing\/20180312-00\/?p=98215<\/p>\n

    \u4f46\u5373\u4f7f\u5982\u6b64\uff0ccherry-pick \u8be5\u7528\u8fd8\u662f\u7528\u5427\uff0c\u6bd5\u7adf\u4e2d\u62db\u51e0\u7387\u5f88\u5c0f\u554a\uff0c\u52a0\u4e0a\u6d4b\u8bd5\u5c31\u66f4\u5c0f\u5566\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : across <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u8fd9\u663e\u7136\u662f\u4ee3\u7801\u7ed3\u6784\u95ee\u9898\u3002\u6a21\u5757\u8c03\u7528 API \u529f\u80fd\u4e0d\u505c\u53d8\uff0c\u54ea\u4e2a\u56e2\u961f\u53d7\u5f97\u4e86\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : BeautifulSoap <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @fucUup \uff1f\uff1f\uff1f\uff1f\u8fd9\u90fd\u60f3\u4e0d\u660e\u767d\uff1f\uff1f\uff1f\u4e00\u4e2a api \u4fee\u6b63\uff0c\u5176\u4e2d\u6a21\u578b\uff0crepository\uff0cservice\uff0capi\uff0cswagger \u7684\u53d8\u66f4\u5fc5\u987b\u62c6\u5206\u6210\u4e0d\u540c\u7684 pr \u3002\u4f60\u6a21\u578b\uff0crepository\uff0cservice \u8fd9\u4e9b\u5730\u65b9\u7684\u7ed3\u6784\u6216\u4e1a\u52a1\u903b\u8f91\u53d8\u4e86\uff0c\u4e0a\u9762\u7684 api \u903b\u8f91\u6ca1\u53d8\uff0c\u5355\u5143\u6d4b\u8bd5\u4e0d\u662f\u6709\u975e\u5e38\u5927\u51e0\u7387\u5931\u8d25\uff1f\u8fd9\u4e0d\u5c31\u662f\u7ec6\u7c92\u5ea6\u5206\u592a\u7ec6\u5bfc\u81f4\u7684\u5355\u5143\u6d4b\u8bd5\u5931\u8d25\uff1f
    \u8fd8\u6709 swagger \u662f\u6839\u636e api \u8bf7\u6c42\u7684\u7ed3\u6784\u4f53\u81ea\u52a8\u751f\u6210\u7684\uff0capi \u8bf7\u6c42\u7684\u7ed3\u6784\u4f53\u662f\u5728 api \u8fa9\u8bc1\u7684 pr \u4e2d\u88ab\u4fee\u6539\u3002\u90a3\u4e48\u8bf7\u95ee\u81ea\u52a8\u751f\u6210\u7684 swagger \u6587\u4ef6 diff\uff0c\u662f\u5e94\u8be5\u548c\u8bf7\u6c42\u7ed3\u6784\u4f53\u7684\u53d8\u66f4\u4e00\u8d77\u63d0\u4ea4\u5462\uff0c\u8fd8\u662f\u5355\u72ec\u63d0\u4ea4\u5462\uff1f
    \u7ec6\u7c92\u5ea6\u5206\u592a\u7ec6\u662f\u771f\u7684\u7ecf\u5e38\u51fa\u4e00\u4e9b\u95ee\u9898 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : sugarkeek <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @yogogo \u4f60\u8fd9\u4e48\u4e00\u8bf4\uff0c\u6211\u60f3\u4e86\u60f3\uff0c\u597d\u50cf\u770b\u5230\u7684\u9879\u76ee\u90fd\u662f\u4e00\u4e2a\u5f00\u53d1\u7248\u672c\u4e00\u4e2a\u5206\u652f\u70b9\u3002<\/p>\n

    \u6211\u73b0\u5728\u5462\uff0cgit \u5728\u9879\u76ee\u91cc\u7684\u5b9e\u8df5\u662f\u770b\u5230\u4e00\u4e9b git \u4ecb\u7ecd\u7684\uff0c\u8bf4\u662f\u65b9\u4fbf\u56e2\u961f\u534f\u4f5c\uff0c\u6bcf\u4e2a\u4eba\u4e00\u4e2a\u5206\u652f\uff0c\u5f00\u53d1\u4e0d\u540c\u6a21\u5757\uff0c\u6700\u540e\u5408\u5e76\u5230\u4e3b\u7ebf\uff0c\u9879\u76ee\u5c31\u5e72\u597d\u4e86\u3002\u57fa\u4e8e\u8fd9\u4e2a\u601d\u60f3\uff0c\u6211\u624d\u91c7\u7528\u4e00\u4e2a\u4eba\u4e00\u4e2a\u5206\u652f\u7684\u3002<\/p>\n

    @hackape \u55ef\u55ef\uff0cthere’s no silver bullet. <\/p>\n

    @learningman \u6211\u662f\u4e3e\u4e2a\u4f8b\u5b50\uff0c\u5c31\u662f\u6709\u53ef\u80fd\u6709\u4ea4\u96c6\u7684\u5730\u65b9\u3002\u6709\u4e9b\u65e9\u671f\u5c0f\u9879\u76ee\u56fe\u5feb\uff0c\u4f1a\u516c\u7528\uff0c\u540e\u9762\u7684\u8bdd\u6211\u90fd\u4f1a\u6ce8\u610f\u8fd9\u4e2a\u95ee\u9898\u3002<\/p>\n

    @sillydaddy \u5b66\u4e60\u4e86\uff0c\u611f\u89c9\u628a\u4e3b\u9898\u90fd\u5347\u534e\u4e86\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : fucUup <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @BeautifulSoap<\/p>\n

    \u6211\u4eec\u6709 40 \u4e2a\u5fae\u670d\u52a1, \u5168\u7403\u56e2\u961f 500 \u4eba\u4e00\u8d77\u5f00\u53d1, \u6bcf\u4e00\u6b21\u53d8\u66f4\u90fd\u662f\u524d\u540e\u517c\u5bb9, \u4e0d\u5b58\u5728\u4f60\u8bf4\u7684\u95ee\u9898, \u4efb\u4f55 break \u4ee3\u7801\u7684\u63d0\u4ea4\u90fd\u4f1a\u88ab\u62d2\u7edd, \u4e0d\u5e94\u8be5\u5148\u91cd\u6784\u4e86\u4e00\u4e2a\u6a21\u5757, \u518d\u53bb\u8865\u5199\u53e6\u5916\u4e00\u4e2a\u6a21\u5757, \u8fd9\u662f\u5e38\u8bc6<\/p>\n

    \u4e5f\u5c31\u662f\u6bcf\u4e00\u4e2a\u6a21\u5757\u90fd\u8981\u4fdd\u7559\u51e0\u4e2a\u5468\u671f\u7684\u903b\u8f91\u540c\u65f6\u5b58\u5728, \u56e0\u4e3a\u4f60\u8981\u8003\u8651\u4f60\u7684\u4e0a\u4e0b\u6e38\u4f1a\u56de\u6eda, \u4e0d\u8fd9\u6837\u505a\u7684\u8bdd\u4f60\u5c31\u7b49\u7740\u4e0a\u65b0\u95fb, \u50cf\u5fae\u535a\u516c\u53f8\u7ecf\u5e38 down \u673a\u4e0a\u70ed\u641c <\/p><\/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
    @yogogo @sugarkeek
    \u8fd9\u4e24\u4e2a\u4e1c\u897f\u539f\u672c\u4e5f\u4e0d\u662f\u51b2\u7a81\u5bf9\u7acb\u7684\u3002
    \u7248\u672c\u9700\u8981\u5f00\u5206\u652f\uff0c\u662f\u56e0\u4e3a\u4f1a\u6709\u7a33\u5b9a\u7248\u548c\u5f00\u53d1\u7248\u4e4b\u5206\u3002
    \u529f\u80fd\u548c\u6a21\u5757\u5f00\u5206\u652f\uff0c\u662f\u56e0\u4e3a\u8981\u591a\u4eba\u540c\u65f6\u8fdb\u884c\u5f00\u53d1\u3002
    \u6bd4\u5982\u4f60\u4eec 1.5 \u7248\u672c\u53d1\u5e03\u540e\uff0c\u5f00\u59cb\u5f00\u53d1 1.6 \u3002\u90a3\u4e48\u53ef\u4ee5\u5148\u5206\u51fa dev-1.6 \u5206\u652f\uff0c\u7136\u540e\u5728 1.6 \u5206\u652f\u4e0a\u518d\u6309\u7167 feature \u5206\u51fa\u4e0d\u540c\u7684\u5206\u652f\u3002\u5f00\u53d1\u5b8c\u4ee5\u540e\u5148 MR \u5230 dev-1.6 \u4e0a\uff0c\u7136\u540e\u7b49\u5168\u90e8\u6d4b\u8bd5\u5b8c\u4e86\uff0c\u518d merge \u5230 master \u4e0a\uff0c\u53d1\u5e03\u4e0a\u7ebf\u3002<\/p>\n

    @sillydaddy cherry-picking \u548c merging \u672c\u8d28\u4e0a\u662f\u5dee\u4e0d\u591a\u7684\uff0c\u8fd9\u548c\u65e0\u58f0\u65e0\u606f\u4e5f\u6ca1\u5173\u7cfb\uff0c\u4e0d\u7ba1\u6709\u58f0\u8fd8\u662f\u65e0\u58f0\uff0c\u6700\u7ec8\u90fd\u53ea\u6709\u6d4b\u8bd5\u624d\u80fd\u51b3\u5b9a\u5408\u5e76\u662f\u5426\u5b89\u5168\u3002cherry-picking \u65e0\u9519\u5e76\u4e0d\u4ee3\u8868\u5408\u5e76\u6210\u529f\u3002\u540c\u65f6\u8fd9\u4e5f\u4e0d\u5e94\u8be5\u6210\u4e3a\u4e0d\u7528 cherry-pick \u7684\u7406\u7531\u3002 <\/p><\/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
    @sillydaddy
    \u6211\u53c8\u7279\u5730\u770b\u4e86\u4e00\u4e0b\uff0c\u5fae\u8f6f\u7684\u8fd9\u7bc7\u6587\u7ae0\u5176\u5b9e\u4e5f\u4e0d\u5bf9\uff0c\u6700\u5408\u7406\u7684\u505a\u6cd5\u662f rebase \u800c\u4e0d\u662f cherry-pick \u6216\u8005 merge \u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : remarrexxar <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u81ea\u52a8\u5316\u6d4b\u8bd5\u8ddf\u5f97\u4e0a\u7684\u8bdd\uff0c\u6240\u6709\u8981\u8fdb master \u5206\u652f\u6216\u8005\u5176\u4ed6\u91cd\u8981\u5206\u652f\u7684\u4ee3\u7801\u90fd\u8981\u8dd1 smoke testing \u4fdd\u8bc1\u81f3\u5c11\u4e0d\u5f71\u54cd\u4e3b\u6d41\u7a0b\uff0c\u5982\u679c\u529f\u80fd\u672c\u8eab\u5f71\u54cd\u4e3b\u6d41\u7a0b\u6d4b\u8bd5\u811a\u672c\u8981\u540c\u6b65\u4fee\u6539\u3002\u6b64\u5916\u8fd8\u9700\u8981\u5b9a\u65f6\u8dd1\u5b8c\u6574\u7684 regression test \u6765\u53d1\u73b0\u5176\u4ed6\u53ef\u80fd\u51fa\u73b0\u7684\u95ee\u9898\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : AlynxZhou <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    diff \u672c\u6765\u7684\u542b\u4e49\u5c31\u662f\u4ece\u4e00\u4e2a\u72b6\u6001\u5230\u53e6\u4e00\u4e2a\u72b6\u6001\u6709\u54ea\u4e9b\u53d8\u5316\u561b\uff0c\u81f3\u4e8e\u8fd9\u4e2a\u53d8\u5316\u662f\u5565\u542b\u4e49\u5b83\u4e0d\u7406\u89e3\u4e5f\u7406\u89e3\u4e0d\u4e86\uff0c\u8fd9\u662f\u5de5\u5177\u4f7f\u7528\u8005\u7684\u4efb\u52a1\uff0c\u4e0d\u662f\u5de5\u5177\u81ea\u5df1\u7684 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : BeautifulSoap <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @fucUup \u8001\u54e5\u5efa\u8bae\u4f60\u518d\u4ed4\u7ec6\u770b\u770b\u6211\u60f3\u8bf4\u7684\u5185\u5bb9\uff0c\u6211\u548c\u4f60\u8981\u8bb2\u7684\u4e1c\u897f\u6839\u672c\u4e0d\u662f\u4e00\u56de\u4e8b\uff0c\u4f60\u8bb2\u7684\u662f\u6574\u4f53\u7684\u7ba1\u7406\uff0c\u6211\u8bb2\u7684\u662f\u5177\u4f53\u5230\u6bcf\u4e2a\u670d\u52a1\u5185\u4ee3\u7801\u7684\u4fee\u6539\u600e\u4e48\u63d0 pr<\/p>\n

    \u6253\u6bd4\u65b9\u5177\u4f53\u6765\u8bf4\u9879\u76ee\u8981\u6c42\u7ed9\u67d0 api \u589e\u52a0\u4e2a\u5b57\u6bb5\uff0c\u4e00\u822c\u5efa\u4e2a feature\/add_field \u5206\u652f\u6539\u597d\u4ee3\u7801\u5c31\u884c\u4e86\uff0c\u4f46\u662f\u56e0\u4e3a\u9879\u76ee\u8981\u6c42\u5f7b\u5e95\u7ec6\u5206 pr\uff0c\u6240\u4ee5\u4f1a\u8981\u6c42\u5c06\u8fd9\u4e00\u4e2a\u53d8\u66f4\u5185\u5bb9\u62c6\u5206\u6210 feature\/add_field_change_model\uff0cfeature\/add_field_change_repository\uff0cfeature\/add_field_change_service \u7b49\u7b49\u5206\u652f\uff0creview \u5b8c\u6210\u4e4b\u540e\u5408\u5e76\u5165 feature\/add_field \u5206\u652f\uff0c\u7b49\u5168\u90e8\u4ee3\u7801\u90fd\u786e\u8ba4\u6ca1\u95ee\u9898\u540e\u518d\u5408\u5e76\u5230 master \u6216\u8005\u5176\u4ed6\u73af\u5883\u5206\u652f<\/p>\n

    \u90a3\u4e48\u6211\u8bf7\u95ee\u4f60\uff0cfeature\/add_field_change_model \u6211\u6539\u4e86\u6a21\u578b\u4f46\u662f\u4e0a\u5c42\u6ca1\u6709\u6539\u5bfc\u81f4 api \u5355\u5143\u6d4b\u8bd5\u5931\u8d25\u4e86\uff0c\u6211\u8be5\u600e\u4e48\u529e\uff1f\u987a\u4fbf\u4e00\u63d0\u56e0\u4e3a\u8fd9\u4e9b\u7ec6\u5206\u7684\u5206\u652f\u53ea\u662f\u5408\u5e76\u5165 feature \u5206\u652f\uff0c\u6240\u4ee5\u4e0d\u4f1a\u5f71\u54cd\u73af\u5883\u91cc\u8dd1\u7684\u670d\u52a1 <\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : sillydaddy <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @msg7086 #28\uff0c\u90a3\u7bc7\u6587\u7ae0\u6211\u770b\u8fc7\u4f46\u73b0\u5728\u5df2\u7ecf\u5fd8\u4e86\u3002rebase \u5185\u90e8\u5c31\u662f\u4f7f\u7528\u7684 cherry-pick \u554a\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : nocrush <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5408\u5e76\u524d\u5148 rebase \u4e0b\u76ee\u6807\u5206\u652f\uff0c\u89e3\u51b3\u5b8c\u51b2\u7a81\u518d merge <\/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
    @sillydaddy \u65b9\u5411\u53cd\u4e86\u3002
    \u5e94\u8be5\u662f\u8ba9\u5206\u652f rebase \u5230\u4e3b\u5e72\uff0c\u4f60\u8bf4\u7684\u90a3\u662f\u628a\u4e3b\u5e72 pick \u5230\u5206\u652f\u3002\u6240\u4ee5\u6211\u624d\u8bf4\u4e0d\u7ba1\u662f pick \uff08\u6216\u8005\u4f60\u8bf4\u7684\u90a3\u79cd\u53cd\u5411 rebase \uff09\u8fd8\u662f merge \u90fd\u662f\u4e0d\u5408\u9002\u7684\u3002<\/p>\n

    rebase \u4e0d\u662f\u57fa\u4e8e cherry pick \u3002\u8fd9\u4e24\u4e2a\u547d\u4ee4\u672c\u6765\u5c31\u90fd\u662f commit \u7684\u8bed\u6cd5\u7cd6\uff0c\u6ca1\u6709\u5185\u90e8\u4e0d\u5185\u90e8\u4e4b\u5206\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : est <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    LZ \u60f3\u8981\u7684\u4e1c\u897f\u662f\uff0c\u4e24\u4e2a\u4eba\u540c\u65f6\u6539\u4e00\u4e2a\u4e1c\u897f\uff0c\u7136\u540e\u6709\u4e00\u4e2a\u795e\u5947\u7684\u81ea\u52a8\u7cfb\u7edf\u6216\u8005\u673a\u5236\uff0c\u80fd\u8ba9\u8fd9\u4e24\u4eba\u6539\u51fa\u6765\u7684\u4e1c\u897f\u4e0d\u4f1a\u6709\u51b2\u7a81\u548c\u6bdb\u75c5\u3002\u3002\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : chiu <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    >> git \u80fd\u89e3\u51b3\u4ee3\u7801\u4e0d\u540c\uff0c\u4f46\u662f\u4e0d\u80fd\u4fdd\u8bc1\u5408\u5e76\u7684\u4ee3\u7801\u6b63\u5e38\u8fd0\u884c
    \u8fd9\u4e2a\u4e3b\u8981\u8fd8\u662f\u770b\u4f60\u4eec\u7ec4\u4f7f\u7528 git \u5f00\u53d1\u9075\u5faa\u7684 workflow \u3002\u5982\u679c\u5408\u5e76\u540e\u4ee3\u7801\u8fd0\u884c\u51fa\u9519\uff0c\u90a3\u57fa\u672c\u662f\u4eba\u4e3a\u7684\u95ee\u9898\uff0c\u6bd5\u7adf resolve conflict \u7684\u65f6\u5019\uff0c\u662f\u4eba\u4e3a\u51b3\u5b9a\u600e\u4e48 resolve \u7684\u3002\u5982\u679c feature \u5206\u652f\u51fa\u6765\u81ea\u6210\u4e00\u652f\u540e\u5f00\u53d1\u4e86\u5f88\u591a\u4e1c\u897f\uff0c\u90a3 rebase \u56de master\/main \u7684\u65f6\u5019\u5927\u91cf conflicts \u5728\u6240\u96be\u514d\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : honjow <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git \u4e0d\u8d1f\u8d23\u8fd9\u4e1c\u897f\uff0c\u6d4b\u8bd5\u8d1f\u8d23 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : 1OF7G <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    Merge \u6ca1\u6709\u51b2\u7a81\uff0c\u4e0d\u4ee3\u8868\u5408\u5e76\u540e\u7684\u4ee3\u7801\u6b63\u786e\u5730\u8868\u8fbe\u4e86\u4f60\u7684\u610f\u56fe\uff0c\u751a\u81f3\u4e0d\u4ee3\u8868\u8fd9\u4e9b\u4ee3\u7801\u80fd\u591f\u6b63\u5e38\u6267\u884c\u3002<\/p>\n

    Git \u53ea\u662f\u5e2e\u4f60\u8ffd\u8e2a\u4ee3\u7801\u53d8\u52a8\uff0c\u4f60\u81ea\u5df1\u5fc5\u987b\u6e05\u695a\u6bcf\u6b21 commit \u5f15\u5165\u4e86\u54ea\u4e9b\u4e9b\u53d8\u52a8\u3002\u901a\u5e38\u5728\u81ea\u5df1\u7f16\u8f91\u5b8c\u4ee3\u7801\u540e\u7acb\u5373\u8fdb\u884c commit , \u5bf9\u5f15\u5165\u7684\u53d8\u52a8\u975e\u5e38\u6e05\u695a\u3002\u800c Merge \u4e5f\u662f\u4e00\u6b21\u5f15\u5165\u53d8\u52a8\u7684 commit\uff0c\u4f46\u9677\u9631\u5c31\u662f\uff0c\u4f60\u53ef\u80fd\u5e76\u4e0d\u6e05\u695a\u8fd9\u6b21 Merge commit \u6240\u5f15\u5165\u7684\u4ee3\u7801\u53d8\u52a8\u3002\uff08\u53ef\u80fd\u662f\u4f60\u5f88\u4e45\u4e4b\u524d\u5199\u7684 \/\u6216\u8005\u662f\u522b\u4eba\u5199\u7684\uff09\u3002<\/p>\n

    \u4ece\u6e90\u5934\u4e0a\u89e3\u51b3\u95ee\u9898\u7684\u65b9\u6cd5\u4e0d\u662f\u4f7f\u7528\u5404\u79cd\u6d4b\u8bd5\uff0c\u800c\u662f review \u8fd9\u6b21 Merge \u6240\u5f15\u5165\u7684\u53d8\u52a8\u3002\u672c\u8d28\u5c31\u662f\uff0c\u628a Merge \u76f2\u76ee\u5f15\u5165\u7684\u53d8\u52a8\uff0c\u53d8\u6210\u4f60\u601d\u8003\u540e\u6240\u8ba4\u540c\u7684\u53d8\u52a8\u3002\u4e0b\u4e00\u6b65\uff0c\u624d\u662f\u5404\u79cd\u6d4b\u8bd5\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : eastphoton <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git \u7ba1\u5408\u5e76\uff0c\u4e0d\u7ba1\u8fd0\u884c\u3002\u3002\u3002<\/p>\n

    rebase \u7ffb\u8bd1\u770b\u5230\u8fc7\u7684\u6700\u65e0\u8bed\u7684\u662f \u53d8\u57fa\u3002\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n","protected":false},"excerpt":{"rendered":"

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