{"id":102903,"date":"2020-05-13T10:48:18","date_gmt":"2020-05-13T02:48:18","guid":{"rendered":"http:\/\/4563.org\/?p=102903"},"modified":"2020-05-13T10:48:18","modified_gmt":"2020-05-13T02:48:18","slug":"git-%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af%e5%90%8e%ef%bc%8c%e5%a6%82%e4%bd%95%e6%81%a2%e5%a4%8d%e8%87%b3%e5%8e%9f%e6%9d%a5%e5%b9%b2%e5%87%80%e7%9a%84%e5%b7%a5%e4%bd%9c%e5%8c%ba%ef%bc%9f","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=102903","title":{"rendered":"git \u5207\u6362\u5206\u652f\u540e\uff0c\u5982\u4f55\u6062\u590d\u81f3\u539f\u6765\u5e72\u51c0\u7684\u5de5\u4f5c\u533a\uff1f"},"content":{"rendered":"
\n
\n
\n

git \u5207\u6362\u5206\u652f\u540e\uff0c\u5982\u4f55\u6062\u590d\u81f3\u539f\u6765\u5e72\u51c0\u7684\u5de5\u4f5c\u533a\uff1f <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : xiaoming1992 <\/span> <\/i> 57<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n
\/\/ branch: master content-of-master  \/\/ branch: issue-53 content-of-master-and-addition-of-issue-53 <\/code><\/pre>\n
\u73b0\u5728\u6211\u4ece issue-53 \u5207\u6362\u56de master, \u60f3\u56de\u5230\u539f\u6765\u5e72\u51c0\u7684\u5de5\u4f5c\u533a\uff08 working directory \uff09, \u662f\u6267\u884c reset \u5417\uff1f<\/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 : wqshare <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 git reset –hard HEAD                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : sbw <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 commit \u5230\u7b2c\u4e8c\u4e2a\u5206\u652f\u7136\u540e checkout \u56de\u53bb\uff0c\u6216\u8005\u76f4\u63a5 checkout \u56de\u53bb\u7136\u540e checkout — . \u64a4\u9500\u4fee\u6539\u6216\u8005 stash push \u4fdd\u5b58\u4e34\u65f6\u4fee\u6539\u518d checkout \u56de\u53bb\u6216\u8005 checkout \u56de\u53bb\u518d reset \u518d checkout — .                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : fzhyzamt <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 \u662f\u5728 issue-53 \u5199\u7684\u4ee3\u7801\uff0c\u6ca1\u6709\u63d0\u4ea4\uff0c\u7136\u540e\u5207\u6362\u5230 master \u5206\u652f\u5417\uff1f
    \u5982\u679c\u4e0d\u60f3\u8981\u8fd9\u4e9b\u4ee3\u7801\uff0cgit reset –hard HEAD\uff0c\u6ce8\u610f\u8fd9\u662f\u4e2a\u65e0\u6cd5\u56de\u6eda\u7684\u64cd\u4f5c\uff0c\u8c28\u614e\u6267\u884c
    \u6216\u8005\u6682\u5b58\u8d77\u6765 git stash save                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : wqshare <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 \u4e0a\u9762\u662f\u91cd\u7f6e\u5df2\u52a0\u5165\u7248\u672c\u7ba1\u7406\u7684\u6587\u4ef6\uff0c\u5bf9\u4e8e\u6ca1\u6709\u52a0\u5165\u7684\u6587\u4ef6\uff0c\u6bd4\u5982\u4e00\u4e9b\u4e34\u65f6\u6587\u4ef6\u7b49\uff0c\u518d\u52a0\u4e0a\uff1agit clean -d -x -f (\u52a0\u4e0a-n \u53ef\u4ee5\u9884\u89c8)                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : xiaoming1992 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @fzhyzamt \u5df2\u7ecf\u63d0\u4ea4\u4e86\uff0c\u4f46\u662f\u5207\u6362\u56de master \u5206\u652f\u540e\uff0c\u5e0c\u671b\u5728\u5de5\u4f5c\u533a\u79fb\u9664\u8fd9\u4e9b\u65b0\u589e\u7684\u5185\u5bb9\uff0c\u8ba9 master \u7684\u5de5\u4f5c\u533a\u56de\u590d\u5230\u539f\u6765\u7684\u72b6\u6001                                                            <\/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
                                                                 \u4f60\u53bb\u5176\u4ed6\u5206\u652f\u7684\u65f6\u5019\uff0c\u539f\u5206\u652f\u7ba1\u7406\u7684\u6587\u4ef6\u672c\u6765\u5c31\u4f1a\u88ab\u66ff\u6362 \/ \u5220\u9664\u6389\uff0c\u4e0d\u9700\u8981\u624b\u52a8\u79fb\u9664\u3002
    \u53ea\u6709\u672a\u53d7\u7ba1\u7406\u7684\u6587\u4ef6\u624d\u4f1a\u7559\u4e0b\u3002                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : zyq2280539 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 git pull –rebase
    git reset –hard
    git clean -d -f                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : xiaoming1992 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @msg7086 \u6211\u83dc b \u4e86\uff0c\u539f\u6765\u53ea\u8981\u6dfb\u52a0\u5230\u63d0\u4ea4\u5c31\u884c\u4e86\uff0c\u6211\u539f\u6765\u662f\u4ec5\u4e00\u90e8\u5206\u63d0\u4ea4\u4e86\uff0c\u8fd8\u6709\u4e00\u90e8\u5206\u6ca1\u63d0\u4ea4\uff0c\u6211\u53ea\u770b\u5230\u6ca1\u63d0\u4ea4\u90e8\u5206\u8fd8\u5b58\u5728\u3002\u3002\u3002<\/p>\n
    0202 \u5e74\u7b2c\u4e00\u6b21\u7528\u8fd9\u4e9b\u529f\u80fd\u7684\u6211\u597d\u50cf\u6709\u70b9\u635e\u3002\u3002\u3002                                                            <\/p><\/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
                                                                 \u6211\u770b\u4e86\u4e0b\u4f60\u7684\u95ee\u9898\uff0c\u591a\u6570\u90fd\u5728 StackOverflow \u4e0a\u6709\u73b0\u6210\u7684\u56de\u7b54                                                            <\/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
                                                                 git stash \u8d2e\u85cf\u4e86\u89e3\u4e00\u4e0b.
    \u5c06\u672c\u5730\u4e0d\u60f3\u63d0\u4ea4\u7684\u6216\u8005\u6682\u65f6\u641e\u4e00\u534a\u7684\u6682\u5b58\u8d77\u6765<\/p>\n
    git reset \u662f\u4e0d\u80fd\u6062\u590d\u7684.\u4e0d\u8981\u8f7b\u6613\u4f7f\u7528                                                            <\/p><\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : xiaoming1992 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @KuroNekoFan #9 \u6211\u770b\u4e86\u4e0b\u4f60\u7684\u95ee\u9898\uff0c\u591a\u6570\u90fd\u5728 StackOverflow \u4e0a\u6709\u73b0\u6210\u7684\u56de\u7b54
    \u6211\u521b\u5efa\u7684\u4e3b\u9898\u4e00\u5171\u6709 40 \u4e2a\u5de6\u53f3\uff0c\u6211\u611f\u89c9\u9664\u4e86\u672c\u95ee\u9898\u548c [\u6d4f\u89c8\u5668\u662f\u600e\u4e48\u5904\u7406.html \u6587\u4ef6\u7684\u7f13\u5b58\u7684] \uff0c\u6211\u7684\u5176\u4ed6\u95ee\u9898\u4e0d\u600e\u4e48\u7b26\u5408 [\u5728 StackOverflow \u4e0a\u6709\u73b0\u6210\u7684\u56de\u7b54] \u5427\uff1f                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : hlx <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 \u53ea\u8981\u662f commit \u8fc7\u7684\u90fd\u4e0d\u4f1a\u4e22\u560e, \u6240\u4ee5\u968f\u4fbf reset –hard, \u4e0d\u884c git reflog \u627e\u56de\u560e                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : hlx <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 https:\/\/www.liaoxuefeng.com\/wiki\/896043488029600\/897013573512192
    \u5b66\u4e00\u6ce2, \u5b66\u4e00\u6ce2                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : hlx <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @fzhyzamt 
    @dswyzx 
    \u53ef\u4ee5\u64a4\u9500, \u53ef\u4ee5\u64a4\u9500, git reflog \u4e86\u89e3\u4e00\u4e0b, \u53ea\u8981\u662f commit \u8fc7\u7684\u90fd\u53ef\u4ee5\u627e\u56de,
    \u5ed6\u5927\u5927\u7684 Git \u6559\u7a0b\u641e\u4e00\u6ce2                                                            <\/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
                                                                 @hlx reflog \u4e0d\u4fdd\u8bc1\u65f6\u6548\u554a                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : hlx <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 @no1xsyzy \u597d\u5427, \u957f\u89c1\u8bc6\u4e86, \u6211\u8fd9\u4e2a\u91ce\u751f\u7a0b\u5e8f\u5458\u53c8…                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : SjwNo1 <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 \u5207\u56de\u5230 master \u8c8c\u4f3c\u4e0d\u4f1a\u5f71\u54cd                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
     \u8cc7\u6df1\u5927\u4f6c : SoloCompany <\/span>  <\/div>\n
     <\/i>            <\/span> <\/div>\n<\/p><\/div>\n
                                                                 \u4e00\u822c moving HEAD \u4e0d\u7528\u505a\u4efb\u4f55\u4e8b\u60c5
    \u53ea\u6709\u4e24\u4e2a HEAD \u7684 gitignore \u4e0d\u4e00\u81f4\u7684\u65f6\u5019\u53ef\u80fd\u4f1a\u5bfc\u81f4\u5207\u5206\u652f\u540e\u4e0d\u5e72\u51c0
    \u90a3\u4e48\u5982\u679c\u90a3\u4e9b\u9057\u7559\u7684\u5185\u5bb9\u786e\u8ba4\u662f\u4e0d\u91cd\u8981\u7684\u8bdd, \u53ef\u4ee5\u4f7f\u7528 clean -f -d \u6e05\u7406                                                            <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"
    git \u5207\u6362\u5206\u652f\u540e\uff0c\u5982\u4f55\u6062\u590d\u81f3\u539f\u6765…<\/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\/102903"}],"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=102903"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/102903\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=102903"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=102903"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=102903"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}