{"id":5012,"date":"2022-03-24T19:10:00","date_gmt":"2022-03-24T11:10:00","guid":{"rendered":"http:\/\/www.menglanglang.cn\/?p=5012"},"modified":"2022-06-13T00:08:39","modified_gmt":"2022-06-12T16:08:39","slug":"your-local-changes-to-the-following-files-would-be-overwritten-by-merge-ds_store","status":"publish","type":"post","link":"http:\/\/www.menglanglang.cn\/?p=5012","title":{"rendered":"Your local changes to the following files would be overwritten by merge: .DS_Store"},"content":{"rendered":"\n<p>GIT \u4ee3\u7801\u7ba1\u7406\u65f6\uff0c\u5728\u5408\u5e76\u5206\u652f\u4ee3\u7801\u8fc7\u7a0b\u4e2d\uff0c\u62a5\u5982\u4e0b\u9519\u8bef\u4fe1\u606f\uff0c\u5bfc\u81f4\u4ee3\u7801\u65e0\u6cd5\u5408\u5e76\u3002<\/p>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\"><p>Your local changes to the following files would be overwritten by merge: .DS_Store bonc-base-common\/.DS_Store bonc-base-common\/src\/.DS_Store bonc-base-common\/src\/main\/.DS_Store bonc-base-common\/src\/main\/java\/.DS_Store bonc-base-common\/src\/main\/java\/com\/.DS_Store bonc-module-system\/.DS_Store bonc-module-system\/src\/.DS_Store bonc-module-system\/src\/main\/.DS_Store bonc-module-system\/src\/main\/resources\/.DS_Store db\/.DS_Store<\/p><\/blockquote>\n\n\n\n<p>\u89e3\u51b3\u65b9\u6cd5\u5982\u4e0b\uff1a<\/p>\n\n\n\n<blockquote class=\"wp-block-quote is-layout-flow wp-block-quote-is-layout-flow\"><p>git restore --staged bonc-base-common\/.DS_Store<br \/>git restore --staged bonc-base-common\/src\/.DS_Store<br \/>git restore --staged bonc-base-common\/src\/main\/.DS_Store<br \/>git restore --staged bonc-base-common\/src\/main\/java\/.DS_Store<br \/>git restore --staged bonc-base-common\/src\/main\/java\/com\/.DS_Store<br \/>git restore --staged bonc-module-system\/.DS_Store<br \/>git restore --staged bonc-module-system\/src\/.DS_Store<br \/>git restore --staged bonc-module-system\/src\/main\/.DS_Store<br \/>git restore --staged bonc-module-system\/src\/main\/resources\/.DS_Store<br \/>git restore --staged db\/.DS_Store<\/p><\/blockquote>\n\n\n\n<p>\u539f\u6587\u94fe\u63a5\uff1a<a href=\"https:\/\/blog.csdn.net\/tzhuwb\/article\/details\/123718925\" target=\"_blank\" rel=\"noreferrer noopener\">https:\/\/blog.csdn.net\/tzhuwb\/article\/details\/123718925<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"<p>GIT \u4ee3\u7801\u7ba1\u7406\u65f6\uff0c\u5728\u5408\u5e76\u5206\u652f\u4ee3\u7801\u8fc7\u7a0b\u4e2d\uff0c\u62a5\u5982\u4e0b\u9519\u8bef\u4fe1\u606f\uff0c\u5bfc\u81f4\u4ee3\u7801\u65e0\u6cd5\u5408\u5e76\u3002 Your local chang [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[648],"tags":[335,861,754],"class_list":["post-5012","post","type-post","status-publish","format-standard","hentry","category-error-warning","tag-error","tag-git","tag-754"],"_links":{"self":[{"href":"http:\/\/www.menglanglang.cn\/index.php?rest_route=\/wp\/v2\/posts\/5012","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/www.menglanglang.cn\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.menglanglang.cn\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.menglanglang.cn\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/www.menglanglang.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=5012"}],"version-history":[{"count":1,"href":"http:\/\/www.menglanglang.cn\/index.php?rest_route=\/wp\/v2\/posts\/5012\/revisions"}],"predecessor-version":[{"id":5013,"href":"http:\/\/www.menglanglang.cn\/index.php?rest_route=\/wp\/v2\/posts\/5012\/revisions\/5013"}],"wp:attachment":[{"href":"http:\/\/www.menglanglang.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=5012"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.menglanglang.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=5012"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.menglanglang.cn\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=5012"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}