{"id":425819,"date":"2021-03-31T10:33:39","date_gmt":"2021-03-31T02:33:39","guid":{"rendered":"http:\/\/4563.org\/?p=425819"},"modified":"2021-03-31T10:33:39","modified_gmt":"2021-03-31T02:33:39","slug":"%e8%af%b7%e6%95%99%e4%b8%80%e4%b8%aa-git-%e9%97%ae%e9%a2%98","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=425819","title":{"rendered":"\u8bf7\u6559\u4e00\u4e2a git \u95ee\u9898"},"content":{"rendered":"
\n
\n
\n

\u8bf7\u6559\u4e00\u4e2a git \u95ee\u9898 <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : Newyorkcity <\/span> <\/i> 6<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
\u9879\u76ee\u4e00\u5f00\u59cb\u5904\u4e8e\u63d0\u4ea4 A \u3002\u6b64\u65f6\u6709\u4e00\u4e9b\u6587\u4ef6\u4ec5\u4ec5\u662f\u88ab add \u8fd8\u6ca1\u6709 commit \u3002
\u56e0\u4e3a\u8981\u5750\u98de\u673a\uff0c\u62c5\u5fc3\u7b14\u8bb0\u672c\u7535\u8111\u5728\u98a0\u7c38\u8fc7\u7a0b\u4e2d\u641e\u574f\u4e86\u786c\u76d8\uff0c\u6240\u4ee5\u5148 commit \u4e86\u4e0b\uff0c\u4ea7\u751f\u4e86\u63d0\u4ea4 B\uff0c\u7136\u540e\u5c06\u63d0\u4ea4 B \u63a8\u9001\u5230\u4e86\u8fdc\u7a0b\u4ed3\u5e93\u3002
\u73b0\u5728\u5c18\u57c3\u843d\u5b9a\uff0c\u6211\u5e0c\u671b\u5c06\u63d0\u4ea4 B \u4ece git \u5386\u53f2\u91cc\u9664\u53bb\uff08\u8fdc\u7a0b\u4ed3\u5e93\u548c\u672c\u5730\uff09\uff0c\u5f62\u6210\u4e00\u4e2a\u53ea\u6709\u63d0\u4ea4 A\uff0c\u63d0\u4ea4 C \uff08\u4e00\u4e2a\u529f\u80fd\u5b8c\u6574\u5b8c\u6210\u4e86\u7684\u4e00\u4e2a\u63d0\u4ea4\uff09\u7684\u7f8e\u4e3d\u7684\u76f4\u7ebf\u3002<\/p>\n

\u6211\u672c\u6765\u662f\u60f3\u5728\u672c\u5730 –soft \u56de\u5230\u63d0\u4ea4 A\uff0c\u7136\u540e\u4ea7\u751f\u63d0\u4ea4 C \u540e push force \u8986\u76d6\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5f62\u6210\u4e00\u6761\u76f4\u7ebf\u3002\u4f46\u53d1\u73b0\u6ca1\u529e\u6cd5\u5f3a\u5236\u63a8\u9001\u8986\u76d6\u8fdc\u7a0b\u4ed3\u5e93\u3002\u6240\u4ee5\u6765\u8bf7\u6559\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u600e\u4e48\u64cd\u4f5c\u662f\u6700\u5408\u7406\u7684\uff1f\u8c22\u8c22\u3002 <\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (11<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : revlis7 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5f00\u4e2a\u4e34\u65f6\u5206\u652f\u5e94\u8be5\u66f4\u65b9\u4fbf\u5427\uff0c\u539f\u5206\u652f force \u4e0d\u4e0a\u53bb\u662f\u56e0\u4e3a\u8fdc\u7aef\u6709\u5176\u4ed6\u540c\u4e8b\u7684 commit \u5417\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : sfqtsh <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u64cd\u4f5c\u5e76\u6ca1\u95ee\u9898\u3002
    git push –force \u4e3a\u4f55\u5931\u8d25\uff1f <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : zouchtssn <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    pushf \u5230\u8fdc\u7a0b\u867d\u7136\u4e16\u754c\u7ebf\u88ab\u62c9\u76f4\uff0c\u4f46\u662f commit \u4f1a\u4e00\u76f4\u5b58\u5728\u4e0b\u53bb\u7684 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : 2wex <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5408\u7406\u7684\u505a\u6cd5\u5c31\u662f\u628a B \u6c38\u4e45\u7559\u4e0b
    \u53ea\u8981\u63a8\u9001\u5230\u4e86\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5c31\u4e0d\u5e94\u8be5\u518d\u6539\u53d8<\/p>\n

    \u4e0b\u6b21\u8fd9\u79cd\u60c5\u51b5\u5e94\u8be5\u5f00\u4e34\u65f6\u5206\u652f <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ayase252 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6709\u4eba\u5728\u4f60\u5206\u652f\u4e0a\u6539\u4e86\u5427\uff0c\u4e0d\u5efa\u8bae push force\uff0cmerge \u56de\u6765 push \u5427\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : Newyorkcity <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @revlis7
    @ayase252
    \u8fd9\u5c31\u662f\u6211\u81ea\u5df1\u4e00\u4e2a\u4eba\u5199\u7740\u73a9\u7684\u9879\u76ee\uff0c\u4e0d\u4f1a\u6709\u5176\u4ed6\u4eba\u5e72\u6270\u7684\u3002<\/p>\n

    @2wex \u8c22\u8c22\u5efa\u8bae\uff0c\u5b66\u4e60\u4e86\u3002
    @sfqtsh \u5177\u4f53\u6d88\u606f\u6ca1\u770b\u5230\uff0c\u7528\u7684\u662f IDEA \u81ea\u5e26\u7684 git \u5de5\u5177\uff0c\u70b9\u51fb push force \u6309\u94ae\u53d1\u73b0\u6309\u4e0d\u4e0b\u53bb <\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ClericPy <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e0a\u4e5f\u63d0\u8fc7\u4e86, \u8fd9\u79cd\u4e8b\u60c5\u8981\u7528\u4e34\u65f6\u5206\u652f, \u6b63\u5f0f\u5206\u652f\u522b\u8f7b\u6613\u63d0\u4ea4, \u540e\u9762\u4f60\u7528\u5230 CI\/CD \u76f8\u5173\u5de5\u5177\u4f1a\u540e\u6094\u517b\u6210\u4e0d\u597d\u7684\u4e60\u60ef\u7684<\/p>\n

    \u53ef\u4ee5\u770b\u770b git flow \u6216\u8005\u7c7b\u4f3c\u7684\u4e1c\u897f(\u867d\u7136 \u6211\u66f4\u559c\u6b22 Github flow \u7684\u5206\u652f\u7ba1\u7406, \u8db3\u591f\u7b80\u5355, \u539f\u7248 git flow \u592a\u590d\u6742\u4e86, \u6211\u505a\u7684\u5927\u90e8\u5206\u4e1c\u897f\u90fd\u4e0d\u4f1a\u591a\u7248\u672c\u5171\u5b58, \u6eda\u52a8\u53d1\u5e03\u5c31\u591f\u4e86), \u6b63\u5e38\u60c5\u51b5\u516c\u53f8\u91cc\u90fd\u4e0d\u5141\u8bb8 force push \u7684<\/p>\n

    \u81ea\u5df1\u73a9\u7684\u8bdd, reset –hard \u7136\u540e push –force \u4e5f\u80fd\u7528, \u4f46\u662f\u5f88\u5c11\u6709\u4eba\u63a8\u8350\u8fd9\u4e48\u64cd\u4f5c. \u6ca1\u5b8c\u6210\u7684\u4ee3\u7801\u6b63\u5e38\u90fd\u5728\u4e34\u65f6\u5206\u652f, \u547d\u540d\u4e00\u822c\u4e5f\u662f wip \u6807\u8bb0 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Dvel <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5728\u7ec8\u7aef\u91cc push –force \u5c31\u884c\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : jotpot <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u98de\u673a\u641e\u574f\u786c\u76d8\uff1f\u7b2c\u4e00\u6b21\u542c\u8bf4 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ChangQin <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    rebase HEAD \u7136\u540e push -f <\/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
    push force \u5c31\u884c\u4e86\u3002\u5982\u679c\u6ca1\u6cd5 force push \u7684\u8bdd\u53bb\u8f6f\u4ef6\u7684\u8bbe\u7f6e\u91cc\u770b\u770b\u3002<\/p>\n

    \u4e0d\u8981\u8ba9\u522b\u4eba\u7684\u4e2a\u4eba\u89c2\u70b9\u5f71\u54cd\u4f60\u3002push force \u8fd9\u4e2a\u529f\u80fd\u65e2\u7136\u6709\uff0c\u5c31\u8bf4\u660e\u6709\u5176\u4f5c\u7528\uff0c\u53ea\u8981\u4f7f\u7528\u5f97\u5f53\u5c31\u4e0d\u4f1a\u6709\u95ee\u9898\u3002 <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

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

    \u8bf7\u6559\u4e00\u4e2a git \u95ee\u9898 \u8cc7\u6df1\u5927\u4f6c …<\/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\/425819"}],"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=425819"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/425819\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=425819"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=425819"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=425819"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}