{"id":138295,"date":"2020-07-21T07:46:31","date_gmt":"2020-07-20T23:46:31","guid":{"rendered":"http:\/\/4563.org\/?p=138295"},"modified":"2020-07-21T07:46:31","modified_gmt":"2020-07-20T23:46:31","slug":"%e5%85%b3%e4%ba%8e-git-%e7%9a%84%e6%96%b0%e6%89%8b%e9%97%ae%e9%a2%98%ef%bc%8c%e8%bf%9c%e7%a8%8b%e5%88%86%e6%94%af%e5%90%88%e5%b9%b6%e5%90%8e%ef%bc%8c%e6%88%91%e6%9c%ac%e5%9c%b0%e5%ba%94%e8%af%a5","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=138295","title":{"rendered":"\u5173\u4e8e git \u7684\u65b0\u624b\u95ee\u9898\uff0c\u8fdc\u7a0b\u5206\u652f\u5408\u5e76\u540e\uff0c\u6211\u672c\u5730\u5e94\u8be5\u600e\u4e48\u7ee7\u7eed\u5f00\u53d1\uff1f"},"content":{"rendered":"
\n
\n
\n

\u5173\u4e8e git \u7684\u65b0\u624b\u95ee\u9898\uff0c\u8fdc\u7a0b\u5206\u652f\u5408\u5e76\u540e\uff0c\u6211\u672c\u5730\u5e94\u8be5\u600e\u4e48\u7ee7\u7eed\u5f00\u53d1\uff1f <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : izzy27 <\/span> <\/i> 6<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n

\u8fdc\u7a0b\u4ed3\u5e93\u6709\u4e24\u4e2a\u5206\u652f\uff0c\u4e00\u4e2a\u662f master \u53e6\u4e00\u4e2a\u662f dev \u6211\u548c\u5176\u4ed6\u4eba\u57fa\u4e8e dev \u800c\u975e\u5e74\u81f3\u65b0\u5efa\u5404\u81ea\u7684\u5206\u652f\u5f00\u53d1\uff0c\u7136\u540e\u73b0\u5728\u5404\u81ea\u7684\u5206\u652f\u90fd\u5408\u5e76\u5230\u4e86\u8fdc\u7a0b\u7684 dev \u5206\u652f\u4e0a<\/p>\n

\u73b0\u5728\u6211\u672c\u5730\u6267\u884c\u5b8c git pull \u4e4b\u540e\uff0c\u6211\u8fd8\u9700\u8981\u505a\u4ec0\u4e48\u64cd\u4f5c\u5417\uff0c\u73b0\u5728 dev \u5206\u652f\u662f\u4e0d\u662f\u9886\u5148\u6211\u548c\u5176\u4ed6\u4eba\u5404\u81ea\u7684\u5206\u652f\uff1f<\/p>\n

\u8fd8\u662f git pull \u5c31\u641e\u5b9a\u4e86\uff0c\u6211\u7ee7\u7eed\u5728\u81ea\u5df1\u7684\u5206\u652f\u4e0a\u5f00\u53d1\u5c31\u884c\u4e86\u5417\uff1f<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (8<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : oneisall8955 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    pull dev \u5206\u652f\uff0c\u518d\u7ee7\u7eed\u5f00\u53d1\u5427 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : yeqizhang <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u57fa\u4e8e dev \u6ca1\u6709\u62c9\u65b0\u5206\u652f\uff0c\u90a3\u5c31\u4e0d\u53eb\u5408\u5e76\u4e86\uff0c\u5c31\u662f push\uff0c\u53ea\u662f\u548c\u522b\u4eba\u6709\u51b2\u7a81\u65f6\u8981 merge conflict \u3002
    \u4f60 git pull \u62c9\u5230\u7684\u5c31\u662f\u6700\u65b0\u7684 dev\uff0c\u4e3a\u4ec0\u4e48\u53eb\u9886\u5148\u4e8e dev <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : lwqldsyzx <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u81ea\u5df1\u672c\u5730\u6ca1\u7528\u66f4\u6539\uff0c\u5c31\u76f4\u63a5 pull \u5c31\u597d\uff0c\u5047\u5982\u662f fork dev \u5206\u652f\u5230\u81ea\u5df1\u4ed3\u5e93 \u90a3\u5c31\u8981 feature \u62c9\u53d6\u8fdc\u7a0b\u7684 dev \u5230\u81ea\u5df1 dev \u4e0a <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : mattxlee <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    pull \u540e\u53ea\u662f\u628a\u8fdc\u7a0b\u7684\u4ed3\u5e93\u7684\u65b0\u5185\u5bb9\u62c9\u5230\u4e86\u672c\u5730\u5e76\u4e14\u548c\u4f60\u5f53\u524d\u7684\u4ee3\u7801\u505a\u4e86\u5408\u5e76\uff0c\u4f60\u9700\u8981\u628a\u5408\u5e76\u540e\u7684\u5185\u5bb9\u518d push \u56de\u53bb\u8fd9\u6837\u5176\u5b83\u7684\u4eba\u624d\u4f1a\u80fd\u62c9\u5230\u4f60\u7684\u65b0\u4ee3\u7801\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : maninfog <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git \u5f53 svn \u7528\u5417\u2026 <\/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
    \u6bcf\u4e2a feature \u4e00\u4e2a\u5206\u652f\uff0c\u5206\u652f\u5408\u5e76\u5230\u4e86 dev \u90a3\u8bf4\u660e\u5206\u652f\u5df2\u7ecf\u7528\u5b8c\u4e86\u5440\u3002
    feature \u5206\u652f\u5220\u6389\uff0cdev \u5206\u652f\u66f4\u65b0\u5230\u6700\u65b0\uff0c\u7136\u540e\u91cd\u65b0\u5f00\u4e00\u4e2a\u65b0\u7684 feature \u5206\u652f\u7ee7\u7eed\u5199\u65b0\u7684 feature \u3002<\/p>\n

    \u7c7b\u4f3c\u8fd9\u6837\uff1a
    \"\u5173\u4e8e <\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : littlewing <\/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 : leimao <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    git rebase <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    \u5173\u4e8e git \u7684\u65b0\u624b\u95ee\u9898\uff0c\u8fdc\u7a0b\u5206\u652f…<\/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\/138295"}],"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=138295"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/138295\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=138295"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=138295"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=138295"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}