{"id":2667,"date":"2021-06-03T10:08:32","date_gmt":"2021-06-03T01:08:32","guid":{"rendered":"https:\/\/www.ish.org\/blog\/?p=2667"},"modified":"2021-06-03T10:13:20","modified_gmt":"2021-06-03T01:13:20","slug":"%e6%99%82%e3%80%85ports-tree%e3%81%8cgit-pull%e3%81%a7%e3%81%8d%e3%81%aa%e3%81%8f%e3%81%aa%e3%82%8b","status":"publish","type":"post","link":"https:\/\/www.ish.org\/blog\/?p=2667","title":{"rendered":"\u6642\u3005ports tree\u304cgit pull\u3067\u304d\u306a\u304f\u306a\u308b"},"content":{"rendered":"<p>cron\u3067\u5b9a\u671f\u7684\u306b\/usr\/ports\u3092git pull\u3057\u3066\u3044\u308b\u306e\u3067\u3059\u304c\u3001\u6642\u3005<br \/>\n<code>error: Your local changes to the following files would be overwritten by merge:<\/code><br \/>\n\u3068\u8868\u793a\u3055\u308c\u3066\u66f4\u65b0\u3067\u304d\u306a\u304f\u306a\u308a\u307e\u3059\u3002<!--more--><br \/>\n\u3053\u306e\u539f\u56e0\u3068\u3057\u3066\u8868\u793a\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb\u306f\u79c1\u306f\u5168\u304f\u89e6\u3063\u3066\u3044\u306a\u3044\u7269\u3070\u304b\u308a\u3067\u539f\u56e0\u4e0d\u660e\u3067\u3059\u3002<br \/>\n\u3053\u306e\u30a8\u30e9\u30fc\u304c\u51fa\u308b\u3068\u3001<code>git checkout .<\/code>\u3068\u304b<code>git reset --hard<\/code>\u3060\u3051\u3067\u306f\u56de\u5fa9\u3057\u306a\u3044\u306e\u3067\u3001<br \/>\n<code>git reset --hard && git clean -fd && git pull<\/code><br \/>\n\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>cron\u3067\u5b9a\u671f\u7684\u306b\/usr\/ports\u3092git pull\u3057\u3066\u3044\u308b\u306e\u3067\u3059\u304c\u3001\u6642\u3005 error: Your local changes to the following files would be overwritten  &hellip; <\/p>\n<p class=\"link-more\"><a href=\"https:\/\/www.ish.org\/blog\/?p=2667\" class=\"more-link\"><span class=\"screen-reader-text\">&#8220;\u6642\u3005ports tree\u304cgit pull\u3067\u304d\u306a\u304f\u306a\u308b&#8221; \u306e<\/span>\u7d9a\u304d\u3092\u8aad\u3080<\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[3],"tags":[],"class_list":["post-2667","post","type-post","status-publish","format-standard","hentry","category-freebsd"],"_links":{"self":[{"href":"https:\/\/www.ish.org\/blog\/index.php?rest_route=\/wp\/v2\/posts\/2667","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.ish.org\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.ish.org\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.ish.org\/blog\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.ish.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=2667"}],"version-history":[{"count":5,"href":"https:\/\/www.ish.org\/blog\/index.php?rest_route=\/wp\/v2\/posts\/2667\/revisions"}],"predecessor-version":[{"id":2672,"href":"https:\/\/www.ish.org\/blog\/index.php?rest_route=\/wp\/v2\/posts\/2667\/revisions\/2672"}],"wp:attachment":[{"href":"https:\/\/www.ish.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=2667"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.ish.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=2667"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.ish.org\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=2667"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}