{"id":216482,"date":"2020-11-22T01:42:09","date_gmt":"2020-11-21T17:42:09","guid":{"rendered":"http:\/\/4563.org\/?p=216482"},"modified":"2020-11-22T01:42:09","modified_gmt":"2020-11-21T17:42:09","slug":"%e4%b8%ba%e4%bb%80%e4%b9%88%e6%88%91%e5%90%88%e5%88%b0-test-%e5%88%86%e6%94%af%e7%9a%84%e4%bb%a3%e7%a0%81%e8%80%81%e6%98%af%e4%bc%9a%e8%87%aa%e5%8a%a8%e6%b6%88%e5%a4%b1%ef%bc%9f-gitlab-%e5%8f%aa","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=216482","title":{"rendered":"\u4e3a\u4ec0\u4e48\u6211\u5408\u5230 test \u5206\u652f\u7684\u4ee3\u7801\u8001\u662f\u4f1a\u81ea\u52a8\u6d88\u5931\uff1f gitlab \u53ea\u6709\u6211\u4e00\u4e2a\u4eba\u7684\u8bb0\u5f55"},"content":{"rendered":"
\n
\n
\n

\u4e3a\u4ec0\u4e48\u6211\u5408\u5230 test \u5206\u652f\u7684\u4ee3\u7801\u8001\u662f\u4f1a\u81ea\u52a8\u6d88\u5931\uff1f gitlab \u53ea\u6709\u6211\u4e00\u4e2a\u4eba\u7684\u8bb0\u5f55 <\/h1>\n

<\/p>\n

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

\u6628\u665a\u6211\u628a feature \u5408\u5230 test\uff0cgitlab \u4e0a\u6709\u589e\u52a0\u7684\u8bb0\u5f55\u3002\u73b0\u5728 feature \u6709\u4ee3\u7801\uff0c\u4f46\u662f test \u6ca1\u6709\u4ee3\u7801\u3002<\/p>\n

\u6211\u518d\u6b21\u5408\u4ee3\u7801\uff0c\u81ea\u52a8\u5408\u5e76\u76f4\u63a5\u4f7f\u7528\u4e86 test \u7684\u4ee3\u7801\uff0c\u8bf7\u95ee\u8fd9\u662f\u4ec0\u4e48\u60c5\u51b5\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 : assiadamo <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5012\u662f\u77e5\u9053 IDEA \u5c06 A \u5408\u5230 B \u7684\u65f6\u5019\uff0c\u4f1a\u628a\u672c\u5730\u7684 A \u5220\u6389\uff0c\u7136\u540e checkout \u56de A \u65f6\uff0c\u4f1a\u4ece\u8fdc\u7a0b\u91cd\u65b0\u62c9 A\uff0c\u5982\u679c\u4f60\u7684 A \u6ca1\u63d0\u5230\u8fdc\u7a0b\uff0c\u6539\u52a8\u5c31\u4e22\u5931\u4e86\uff0c\u4e0d\u77e5\u9053\u4f60\u662f\u4e0d\u662f\u8fd9\u4e2a\u95ee\u9898 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 20498860 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @assiadamo \u6211\u662f\u7528\u547d\u4ee4\u884c\u5408\u7684 \u7f16\u8f91\u5668\u662f VSCODE \u6709\u5f71\u54cd\u5417 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : assiadamo <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @20498860 \u90a3\u5e94\u8be5\u4e0d\u662f\u6211\u8bf4\u7684\u95ee\u9898\uff0c\u4f60 merge \u8fc7\u540e\u6709 push \u5417
    \u6b63\u786e\u7684\u6d41\u7a0b\u5e94\u8be5\u662f
    1. commit feature (push feature)
    2. checkout test
    3. merge feature to test
    4. push test <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 20498860 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @assiadamo \u80af\u5b9a\u6709 push \u7684\uff0cgitlab \u4e0a\u90fd\u80fd\u770b\u89c1\u660e\u7ec6\u7684\uff0c\u6ca1\u6709 push \u80af\u5b9a\u6ca1\u6709\u7684\u6492 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : KuroNekoFan <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @assiadamo #1 \u8fd9\u611f\u89c9\u597d\u5751 <\/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
    \u6700\u8fd1\u53d1\u73b0\u4e00\u4e2a\u529f\u80fd\uff0c\u6311\u62e3\uff0c\u5728 main \u5206\u652f\uff0c\u67e5\u770b dev \u5206\u652f\u5386\u53f2\u8bb0\u5f55\uff0c\u70b9\u9009\u4e00\u4e2a commit \u53f3\u952e\u6311\u62e3\u8fc7\u6765\uff0c\u5408\u7684\u7279\u522b\u723d <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : laoyur <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @dswyzx cherry-pick? <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : f6x <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u547d\u4ee4\u90fd\u4e0d\u5199, \u600e\u4e48\u5e2e\u4f60…. <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 20498860 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @f6x
    \u6211\u4e00\u822c\u662f\u8fd9\u6837\u7684
    git add .
    git commit -m ‘msg’
    git pull
    git push
    git checkout test
    git pull
    git merge feature
    git push
    \u8fd9\u6837\u4f1a\u6709\u5565\u95ee\u9898\u5417\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : f6x <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6d41\u7a0b\u6ca1\u95ee\u9898.
    \u662f\u4e0d\u662f \u5012\u6570 2,3 \u884c\u7684 pull \u6216 merge \u51fa\u73b0\u51b2\u7a81\u4e86\u4f60\u6ca1\u5904\u7406? <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : zifangsky <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u63a8\u8350\u7528\u53ef\u89c6\u5316\u5de5\u5177\uff08\u6bd4\u5982\uff1aFork \uff09\uff0c\u8fd9\u6837\u5373\u4f7f\u4e2d\u95f4\u54ea\u4e2a\u6b65\u9aa4\u6709\u95ee\u9898\u4e5f\u53ef\u4ee5\u5f88\u76f4\u89c2\u5730\u770b\u5230\u5e76\u89e3\u51b3\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : 20498860 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @f6x \u6709\u51b2\u7a81\u6ca1\u5904\u7406 push \u4e0d\u4e86\u7684\u5440 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : tikazyq <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6709\u4eba\u534a\u591c\u5220\u4f60\u4ee3\u7801 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : acr0ss <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git log \u770b\u770b test \u5206\u652f\u7684\u5386\u53f2\u5462\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    \u4e3a\u4ec0\u4e48\u6211\u5408\u5230 test \u5206\u652f\u7684\u4ee3\u7801…<\/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\/216482"}],"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=216482"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/216482\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=216482"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=216482"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=216482"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}