{"id":194431,"date":"2020-11-01T19:42:06","date_gmt":"2020-11-01T11:42:06","guid":{"rendered":"http:\/\/4563.org\/?p=194431"},"modified":"2020-11-01T19:42:06","modified_gmt":"2020-11-01T11:42:06","slug":"%e6%b1%9f%e6%b9%96%e6%95%91%e6%80%a5%ef%bc%81-git-%e5%90%88%e5%b9%b6%e5%86%b2%e7%aa%81%ef%bc%8c%e7%ac%ac%e4%b8%80%e6%ac%a1%e9%81%87%e5%88%b0%e8%bf%99%e7%a7%8d%e6%8a%a5%e9%94%99%ef%bc%8c%e8%bf%98","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=194431","title":{"rendered":"\u6c5f\u6e56\u6551\u6025\uff01 git \u5408\u5e76\u51b2\u7a81\uff0c\u7b2c\u4e00\u6b21\u9047\u5230\u8fd9\u79cd\u62a5\u9519\uff0c\u8fd8\u662f\u7f51\u4e0a\u641c\u4e0d\u5230\u7b54\u6848\u7684\u90a3\u79cd"},"content":{"rendered":"
\n
\n
\n

\u6c5f\u6e56\u6551\u6025\uff01 git \u5408\u5e76\u51b2\u7a81\uff0c\u7b2c\u4e00\u6b21\u9047\u5230\u8fd9\u79cd\u62a5\u9519\uff0c\u8fd8\u662f\u7f51\u4e0a\u641c\u4e0d\u5230\u7b54\u6848\u7684\u90a3\u79cd <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : solider245 <\/span> <\/i> 7<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n

\"\u6c5f\u6e56\u6551\u6025\uff01<\/p>\n

\u5982\u56fe\u6240\u793a\uff0c\u4e00\u76f4\u5728\u4e00\u4e2a\u5206\u652f\u4e0a\u5199\u5185\u5bb9\uff0c\u7136\u540e\u83ab\u540d\u5176\u5999\u7684\u5c31\u8df3\u51fa\u5f88\u591a\u6587\u4ef6\uff0c\u751a\u81f3\u8fd8\u8dd1\u5230\u5176\u4ed6\u6587\u4ef6\u5939\u53bb\uff0c\u5f53\u65f6\u4e5f\u6ca1\u6ce8\u610f\uff0c\u5c31\u8fd9\u4e9b\u591a\u51fa\u6765\u7684\u6587\u4ef6\u90fd\u5220\u9664\u4e86\u3002 \u73b0\u5728\u51fa\u73b0\u4e86\u8fd9\u79cd\u60c5\u51b5\uff0c\u8bf4\u6211\u7684\u63d0\u4ea4\u597d\u50cf\u6ca1\u6709\u88ab\u5305\u542b\u5728\u8fdc\u7a0b\u5206\u652f\u4e2d\u3002<\/p>\n

error: \u5bf9\u8c61\u6587\u4ef6 .git\/objects\/9e\/e311b31fe7519d4e182ed9a805f1b60d6cc031 \u4e3a\u7a7a fatal: \u677e\u6563\u5bf9\u8c61 9ee311b31fe7519d4e182ed9a805f1b60d6cc031 \uff08\u4fdd\u5b58\u5728 .git\/objects\/9e\/e311b31fe7519d4e182ed9a805f1b60d6cc031 \uff09\u5df2\u635f\u574f <\/code><\/pre>\n
\u63a8\u9001\u7684\u65f6\u5019\u62a5\u8fd9\u79cd\u9519\uff0c\u60f3\u77e5\u9053\u8fd9\u8be5\u548b\u6574\uff1f\u611f\u89c9\u662f\u51b2\u7a81\u5408\u5e76\uff0c\u6d89\u53ca\u5230\u4ee3\u7801\u56de\u9000\uff0c\u6211\u73b0\u5728\u672c\u5730\u4ee3\u7801\u662f\u6587\u4ef6\u662f\u6ca1\u95ee\u9898\u7684\uff0c\u8fdc\u7a0b\u4ed3\u5e93\u597d\u50cf\u662f\u56e0\u4e3a\u9519\u8bef\u7684\u63d0\u4ea4\u88ab\u6574\u4e71\u4e86\u3002 \u4f46\u662f\u62c9\u53d6\u4e0b\u6765\u6216\u8005\u5f3a\u884c\u63a8\u9001\u90fd\u4e0d\u884c\u3002<\/p>\n
\u6709\u4ec0\u4e48\u529e\u6cd5\uff0c\u53ef\u4ee5\u8ba9\u6211\u628a\u672c\u5730\u4ed3\u5e93\u5f3a\u884c\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff1f<\/p>\n
\u76ee\u524d\u60f3\u597d\u7684\u4e00\u4e2a\u571f\u529e\u6cd5\uff0c\u5c31\u662f\u628a\u672c\u5730\u4ed3\u5e93\u7684.git \u5220\u9664\u54af\uff0c\u8fdc\u7a0b\u4ed3\u5e93\u4e5f\u5220\u9664\u4e86\u91cd\u5efa\uff0c\u7136\u540e\u672c\u5730\u8fdc\u7a0b\u91cd\u65b0\u5efa\u7acb\u8054\u7cfb\uff0c\u53ea\u662f\u8fd9\u6837\u7684\u8bdd\uff0c\u5c31\u7b49\u4e8e\u4ee5\u524d\u7684\u7248\u672c\u7ba1\u7406\u5168\u90e8\u4e22\u4e86\u3002\u867d\u7136\u6211\u73b0\u5728\u4e5f\u6ca1\u6709\u591a\u5927\u7528\uff0c\u4f46\u662f\u60f3\u60f3\uff0c\u603b\u4e0d\u80fd\u6bcf\u6b21\u90fd\u8fd9\u4e48\u571f\u6cd5\u89e3\u51b3\u5427\uff1f<\/p>\n
\"\u6c5f\u6e56\u6551\u6025\uff01 \u8fd9\u5f20\u56fe\u662f\u6211\u53d1\u73b0\u9519\u8bef\u7684\u65f6\u5019\u7684\u63d0\u4ea4\u3002\u611f\u89c9\u6574\u4e2a\u4eba\u90fd\u8981\u5d29\u6e83\u4e86\u2026\u2026\u4e00\u76f4\u5728\u4e00\u6761\u8def\u4e0a\u8d70\u5230\u9ed1\u7684\u611f\u89c9\u3002<\/p>\n<\/p><\/div>\n
 \u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (18<\/span>)        <\/div>\n
 <\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : darksword21 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 \u628a\u8fd9\u6b21 commit \u7684\u4ee3\u7801\u624b\u52a8 copy \u51fa\u6765\u7136\u540e reset \uff1f                                                            <\/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
                                                                 \u5148\u627e\u4e2a\u5176\u4ed6\u5730\u65b9 clone \u4e00\u4e0b\u770b\u770b\u5185\u5bb9
    gitee\/master \u7684\u5185\u5bb9\u662f\u5426\u6b63\u5e38\uff1f<\/p>\n
    git \u6574\u4e2a\u6587\u4ef6\u5939\u590d\u5236\u51fa\u6765\u968f\u4fbf\u73a9\u2026\u2026                                                            <\/p><\/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
                                                                 \u5148\u786e\u8ba4\uff1a
    1. \u8fdc\u7aef\u7684 master \u5185\u5bb9\u662f\u5426\u6b63\u5e38\uff1f\u4ece 26a12a84 \u5230 master \u54ea\u5f00\u59cb\u4e0d\u6b63\u5e38\u7684\uff1f
    \u5982\u679c\u6b63\u5e38\uff0c\u90a3\u91cd\u65b0 fetch \u5b8c\u53d8\u57fa\u5427
    \u5982\u679c\u4e0d\u6b63\u5e38\uff0c
    2. \u672c\u5730\u7684 gitee\/master \u662f\u5426\u6b63\u5e38\uff1f\u4ece 26a12a84 \u5230 gitee\/master \u54ea\u5f00\u59cb\u4e0d\u6b63\u5e38\u7684\uff1f
    \u5982\u679c\u6b63\u5e38\uff0ccheckout master && rebase gitee\/master && push –force \u5427
    \u5982\u679c\u4e5f\u4e0d\u6b63\u5e38\uff0c\u90a3\u5c31\u770b master \u662f\u5426\u6b63\u5e38\uff0c\u5c31\u5f53\u522b\u4eba\u7684 PR \u4f60 squash && merge \u4e86\u5427\uff08
    \u5982\u679c master \u4e5f\u4e0d\u6b63\u5e38\uff0c\u90a3\u4f60\u53ef\u80fd\u56de\u9000\u5230 26a12a84-1 \u6765\u5904\u7406\u4e86\u2026\u2026\u767d\u505a\u4e86                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : SunriseFox <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 \u9047\u5230\u8fd9\u79cd\u60c5\u51b5 8 \u6210\u662f\u786c\u76d8\u574f\u4e86\u2026                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : solider245 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @no1xsyzy \u5c31\u662f master \u4e0d\u6b63\u5e38\uff0c\u8fdc\u7a0b\u4ed3\u5e93\u88ab\u6c61\u67d3\u4e86\u3002\u7136\u540e\u6211\u624b\u8d31\u62c9\u53d6\u4e0b\u6765\uff0c\u8fd8\u53d8\u57fa\u4e86\u3002
    \u4e0d\u77e5\u9053\u6211\u76f4\u63a5\u628a\u84dd\u8272\u76f4\u63a5\u56de\u9000\uff0c\u7136\u540e\u548c\u7ea2\u8272\u5408\u5e76\uff0c\u8fd9\u6837\u884c\u4e0d\u884c\uff1f
    \u51fa\u95ee\u9898\u5e94\u8be5\u5c31\u662f\u4ece\u7ea2\u8272\u5206\u624b\u90a3\u91cc\u5f00\u59cb\u7684\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : solider245 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @SunriseFox \u6211\u7528\u7684 wsl\uff0c\u770b\u6765\u771f\u6709\u53ef\u80fd\u3002
    \u56e0\u4e3a\u5f53\u65f6\u6211\u8fd9\u4e2a\u6587\u4ef6\u5939\u7684\u6587\u4ef6\u5c45\u7136\u8df3\u5230\u5230\u4e86\u684c\u9762\u4e0a\u3002
    \u8fd9\u6837\u770b\u7684\u8bdd\uff0c\u96be\u9053\u662f\u786c\u76d8\u6307\u9488\u51fa\u95ee\u9898\u4e86\uff1f\uff08\u6211\u4e0d\u61c2\uff0c\u968f\u4fbf\u4e71\u731c\u7684\uff09                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : fiveelementgid <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 Pro Git \u4e66\u4e0a\u597d\u50cf\u6709\u5199\uff1f\u4e5f\u8bb8\u6ca1\u6709
     git \u5206\u4e3a\u9876\u5c42\u548c\u5e95\u5c42\u4e24\u5957\u547d\u4ee4
    \u4f60\u770b\u770b\u5e95\u5c42\u7684
    `git ref-log` \u8fd8\u80fd\u4e0d\u80fd\u6551\uff1f
    \u5982\u679c\u4e0d\u884c\uff0c\u90a3\u5c31 interaction \u6a21\u5f0f\u8fdb\u5165 rebase\uff0c\u628a\u635f\u574f\u8282\u70b9\u5220\u6389
    `git rebase -i HEAD~<Num>`                                                            <\/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
                                                                 @solider245 \u672c\u5730\u6ca1\u6709\u672a commit \u7684\u4e1c\u897f\u6216\u8005 stash \u4e86\u7684\u60c5\u51b5\u4e0b\u53ef\u4ee5 checkout gitee\/master \u770b\u4e00\u4e0b\u2026\u2026
    \u6b63\u5e38\u7684\u8bdd\uff0c\u770b\u4e0a\u53bb\u5206\u624b\u4e4b\u540e master \u5c31\u4e00\u4e2a commit\uff0c\u76f4\u63a5\u53d8\u57fa\u5c31\u6210\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : junwind <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 \u4fdd\u8bc1\u8fdc\u7a0b\u6587\u4ef6\u90fd\u6b63\u5e38\uff0c\u4ece\u65b0\u514b\u9686\u4e00\u4efd\u8fdc\u7a0b\u4ee3\u7801\u5c31\u884c\u4e86\uff0c\u51fa\u9519\u7684\u672c\u5730\u76f4\u63a5\u5220\u6389                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : likaci <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @solider245 #5
    “\u8fd8\u53d8\u57fa\u4e86” \u54c8\u54c8\u54c8\u54c8                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : burnbrid <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 \u4f60\u8fd9\u4e2a git \u56fe\u50cf\u754c\u9762\u662f\u54ea\u4e2a\u8f6f\u4ef6\u7684\uff1f                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : christin <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @burnbrid \u540c\u6c42                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : reus <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 error: \u5bf9\u8c61\u6587\u4ef6 .git\/objects\/9e\/e311b31fe7519d4e182ed9a805f1b60d6cc031 \u4e3a\u7a7a<\/p>\n
    \u8fd9\u4e0d\u5f88\u6e05\u695a\u561b\uff0c\u672c\u5730\u7684 git repo \u6587\u4ef6\u6709\u95ee\u9898\uff01<\/p>\n
    \u4e0d\u662f\u5408\u5e76\u6709\u95ee\u9898\uff0c\u4f60\u672c\u5730\u7684\u4ed3\u5e93\u5c31\u6709\u95ee\u9898\u4e86\uff0c\u53ea\u80fd\u628a\u6e90\u7801\u590d\u5236\u51fa\u6765\uff0c\u5220\u9664\u672c\u5730\u4ed3\u5e93\uff0c\u518d\u91cd\u65b0\u62c9\u4e0b\u6765\uff0c\u518d\u5e94\u7528\u66f4\u6539\u3002<\/p>\n
    \u8c01\u53eb\u4f60\u7528 wsl \u5462\uff01                                                            <\/p><\/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
                                                                 @burnbrid @christin \u8c8c\u4f3c\u662f vscode \u7684 git graph \u63d2\u4ef6                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : Tomotoes <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 git reflog \u4e86\u89e3\u4e0b..                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : solider245 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @reus \u6240\u4ee5\u2026\u2026\u660e\u767d\u4e86\uff0c\u5c31\u662f\u571f\u6cd5\u70bc\u94a2\uff0c\u5c0f\u7164\u7a91\u6316\u77ff\uff0c\u6572\u4e86\u91cd\u6765\uff1f
    @crclz \u662f\u7684\uff0c\u662f\u90a3\u4e2a\u63d2\u4ef6
    @Tomotoes \u597d\u7684\uff0c\u6211\u53bb\u770b\u770b                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : solider245 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @junwind \u73b0\u5728\u662f\u8fdc\u7a0b\u4ed3\u5e93\u56e0\u4e3a\u51fa\u9519\u4e0d\u6b63\u5e38\uff0c\u672c\u5730\u6b63\u5e38\uff0c\u5982\u4f55\u89e3\u51b3\uff1f                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : solider245 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @junwind 
    @reus 
    \u53c2\u7167\u4f60\u4eec\u4e24\u4f4d\u5927\u795e\u7684\u95ee\u9898\uff0c\u89e3\u51b3\u4e86\u3002
    1. \u91cd\u65b0\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u62c9\u53d6\u6587\u4ef6\uff0c\u7136\u540e\u624b\u52a8\u628a\u91cd\u590d\u7684\u6587\u4ef6\u548c\u51fa\u9519\u7684\u6587\u4ef6\u5220\u9664\u4e86\u3002
    \u51fa\u95ee\u9898\u7684\u539f\u56e0\u5728\u4e8e\u4f7f\u7528\u4e86\u4e00\u4e2a\u8f6f\u4ef6\uff0c\u4f1a\u81ea\u52a8\u5bf9\u6587\u4ef6\u5939\u8fdb\u884c\u7248\u672c\u7ba1\u7406\uff0c\u4f30\u8ba1\u662f\u5f15\u8d77\u7684\u9519\u8bef                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"
    \u6c5f\u6e56\u6551\u6025\uff01 git \u5408\u5e76\u51b2\u7a81\uff0c\u7b2c\u4e00…<\/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\/194431"}],"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=194431"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/194431\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=194431"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=194431"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=194431"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}