{"id":162609,"date":"2020-10-01T14:08:53","date_gmt":"2020-10-01T06:08:53","guid":{"rendered":"http:\/\/4563.org\/?p=162609"},"modified":"2020-10-01T14:08:53","modified_gmt":"2020-10-01T06:08:53","slug":"%e5%9d%91gitlab-%e4%b8%8a%e6%8a%8a%e4%b8%bb%e5%88%86%e6%94%af%e5%90%88%e5%b9%b6%e5%88%b0%e5%85%b6%e4%bb%96%e5%88%86%e6%94%af%ef%bc%8c%e8%a7%a3%e5%86%b3%e5%86%b2%e7%aa%81%e5%90%8e","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=162609","title":{"rendered":"\u5751\u2026\u2026gitlab \u4e0a\u628a\u4e3b\u5206\u652f\u5408\u5e76\u5230\u5176\u4ed6\u5206\u652f\uff0c\u89e3\u51b3\u51b2\u7a81\u540e\u5c45\u7136\u628a\u5176\u4ed6\u5206\u652f\u7ed9\u5408\u5e76\u56de\u4e3b\u5206\u652f\u4e86\u3002\u3002\u3002"},"content":{"rendered":"
\n
\n
\n

\u5751\u2026\u2026gitlab \u4e0a\u628a\u4e3b\u5206\u652f\u5408\u5e76\u5230\u5176\u4ed6\u5206\u652f\uff0c\u89e3\u51b3\u51b2\u7a81\u540e\u5c45\u7136\u628a\u5176\u4ed6\u5206\u652f\u7ed9\u5408\u5e76\u56de\u4e3b\u5206\u652f\u4e86\u3002\u3002\u3002 <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : willxiang <\/span> <\/i> 1<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n

\u4e2d\u5348\u5348\u4f11\u524d\u628a master \u5408\u5e76\u5230\u6211\u5f53\u524d\u5f00\u53d1\u7684\u5206\u652f\u4e0a\uff08\u56e0\u4e3a\u4e00\u4e9b\u539f\u56e0\uff09 \u5f53\u65f6\u63d0\u793a\u6709\u51e0\u4e2a\u51b2\u7a81\uff0c\u6211\u76f4\u63a5\u5728\u9875\u9762\u4e0a\u556a\u556a\u5c31\u7ed9\u89e3\u51b3\u7136\u540e\u76f4\u63a5\u5408\u5e76\u4e86\u3002 3 \u70b9\u949f\u7684\u65f6\u5019\u5176\u4ed6\u540c\u4e8b\u8bf4\u6211\u600e\u4e48\u628a\u6211\u5f00\u53d1\u7684\u5206\u652f\u7ed9\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e86\uff0c\u6211\u4e00\u8138\u61f5\u903c\u3002 \u4e00\u770b\u63d0\u4ea4\uff0c\u6211\u9760\u8fd8\u771f\u7ed9\u5408\u8fdb\u6765\u4e86\uff0c\u6211\u90fd\u4ee5\u4e3a\u6211\u5f53\u65f6\u771f\u7684\u5408\u53cd\u4e86<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (7<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : KuroNekoFan <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    gitlab \u7f51\u9875\u64cd\u4f5c merge \u662f\u633a\u8ff7\u7684\uff0c\u8bd5\u8fc7\u4e00\u6b21\u518d\u4e5f\u4e0d\u6562\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : mercury233 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u89e3\u51b3\u628a patch-1 \u5408\u5230 patch-2 \u65f6\u7684\u51b2\u7a81\u4e00\u822c\u662f\u628a patch-2 \u53cd\u8fc7\u6765\u5408\u5230 patch-1\uff0c\u786e\u4fdd patch-1 \u5305\u542b patch-2 \u6240\u6709\u7684\u63d0\u4ea4\uff0cgithub \u89e3\u51b3 pr \u51b2\u7a81\u4e5f\u662f\u8fd9\u6837\u7684\u601d\u8def <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : leopod1995 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e07\u80fd\u6a21\u677f dev \u5408\u5e76\u5230 master \u6709\u51b2\u7a81
    – git reset –soft
    – git stash
    – git fetch & merge master
    – git stash pop
    – fix conflict
    – git commit & merge <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Mogugugugu <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u524d\u51e0\u5929\u521a\u88ab\u5751\u8fc7\uff0c\u4e0d\u8981\u5728\u7f51\u9875\u4e0a\u9762 \u5904\u7406\u51b2\u7a81\u3001\u3001\u3001 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : zdt3476 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6240\u4ee5\u8fd9\u79cd\u64cd\u4f5c\u8fd8\u662f\u9700\u8981\u6709\u4eba review \u6bd4\u8f83\u5408\u9002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : XiLingHost <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5efa\u8bae git \u8fd8\u662f\u672c\u5730\u5728\u547d\u4ee4\u884c\u64cd\u4f5c\u540e\u63a8\u9001\u4e0a\u53bb\u5427\uff0c\u7f51\u9875\u64cd\u4f5c\u603b\u611f\u89c9\u65e0\u6cd5\u5224\u65ad\u5b9e\u9645\u6267\u884c\u7684\u662f\u4ec0\u4e48\u6307\u4ee4 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : shm7 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6240\u4ee5\u4f60\u8fd9\u4e2a\u5751\uff0c\u662f\u6307\u81ea\u5df1\u5417\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    \u5751\u2026\u2026gitlab \u4e0a\u628a\u4e3b\u5206\u652f\u5408\u5e76…<\/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\/162609"}],"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=162609"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/162609\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=162609"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=162609"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=162609"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}