{"id":1187,"date":"2020-07-28T16:20:29","date_gmt":"2020-07-28T08:20:29","guid":{"rendered":"https:\/\/www.siediyer.cn\/?p=1187"},"modified":"2020-07-28T16:20:29","modified_gmt":"2020-07-28T08:20:29","slug":"git%e4%bb%a3%e7%a0%81%e5%86%b2%e7%aa%81%e5%b8%b8%e8%a7%81%e8%a7%a3%e5%86%b3%e6%96%b9%e6%b3%95","status":"publish","type":"post","link":"https:\/\/www.siediyer.cn\/?p=1187","title":{"rendered":"Git:\u4ee3\u7801\u51b2\u7a81\u5e38\u89c1\u89e3\u51b3\u65b9\u6cd5"},"content":{"rendered":"<p>\u5982\u679c\u7cfb\u7edf\u4e2d\u6709\u4e00\u4e9b\u914d\u7f6e\u6587\u4ef6\u5728\u670d\u52a1\u5668\u4e0a\u505a\u4e86\u914d\u7f6e\u4fee\u6539,\u7136\u540e\u540e\u7eed\u5f00\u53d1\u53c8\u65b0\u6dfb\u52a0\u4e00\u4e9b\u914d\u7f6e\u9879\u7684\u65f6\u5019,<\/p>\n<p>\u5728\u53d1\u5e03\u8fd9\u4e2a\u914d\u7f6e\u6587\u4ef6\u7684\u65f6\u5019,\u4f1a\u53d1\u751f\u4ee3\u7801\u51b2\u7a81:<\/p>\n<p>error: Your local changes to the following files would be overwritten by merge:<br \/>\nprotected\/config\/main.php<br \/>\nPlease, commit your changes or stash them before you can merge.<\/p>\n<p>\u5982\u679c\u5e0c\u671b\u4fdd\u7559\u751f\u4ea7\u670d\u52a1\u5668\u4e0a\u6240\u505a\u7684\u6539\u52a8,\u4ec5\u4ec5\u5e76\u5165\u65b0\u914d\u7f6e\u9879, \u5904\u7406\u65b9\u6cd5\u5982\u4e0b:<\/p>\n<pre class=\"lang:default decode:true \">git stash\r\ngit pull\r\ngit stash pop<\/pre>\n<p>\u7136\u540e\u53ef\u4ee5\u4f7f\u7528git diff -w +\u6587\u4ef6\u540d \u6765\u786e\u8ba4\u4ee3\u7801\u81ea\u52a8\u5408\u5e76\u7684\u60c5\u51b5.<\/p>\n<p>\u53cd\u8fc7\u6765,\u5982\u679c\u5e0c\u671b\u7528\u4ee3\u7801\u5e93\u4e2d\u7684\u6587\u4ef6\u5b8c\u5168\u8986\u76d6\u672c\u5730\u5de5\u4f5c\u7248\u672c. \u65b9\u6cd5\u5982\u4e0b:<\/p>\n<pre class=\"lang:default decode:true \">git reset --hard\r\ngit pull<\/pre>\n<p>\u5176\u4e2dgit reset\u662f\u9488\u5bf9\u7248\u672c,\u5982\u679c\u60f3\u9488\u5bf9\u6587\u4ef6\u56de\u9000\u672c\u5730\u4fee\u6539,\u4f7f\u7528<\/p>\n<pre class=\"lang:default decode:true \">git checkout HEAD file\/to\/restore<\/pre>\n<p>&nbsp;<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5982\u679c\u7cfb\u7edf\u4e2d\u6709\u4e00\u4e9b\u914d\u7f6e\u6587\u4ef6\u5728\u670d\u52a1\u5668\u4e0a\u505a\u4e86\u914d\u7f6e\u4fee\u6539,\u7136\u540e\u540e\u7eed\u5f00\u53d1\u53c8\u65b0\u6dfb\u52a0\u4e00\u4e9b\u914d\u7f6e\u9879\u7684\u65f6\u5019, \u5728\u53d1\u5e03\u8fd9\u4e2a\u914d\u7f6e\u6587\u4ef6\u7684\u65f6 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-1187","post","type-post","status-publish","format-standard","hentry","category-linux"],"_links":{"self":[{"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/posts\/1187","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=1187"}],"version-history":[{"count":1,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/posts\/1187\/revisions"}],"predecessor-version":[{"id":1188,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=\/wp\/v2\/posts\/1187\/revisions\/1188"}],"wp:attachment":[{"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1187"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=1187"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.siediyer.cn\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=1187"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}