{"id":83,"date":"2007-09-18T20:06:33","date_gmt":"2007-09-18T11:06:33","guid":{"rendered":"http:\/\/blog.cgfm.jp\/garyu\/archives\/83"},"modified":"2009-08-07T17:51:28","modified_gmt":"2009-08-07T08:51:28","slug":"svn%e3%81%a7%e9%96%93%e9%81%95%e3%81%a3%e3%81%9f%e3%82%b3%e3%83%9f%e3%83%83%e3%83%88%e3%82%92merge%e3%81%a7%e6%88%bb%e3%81%99%e3%82%b3%e3%83%9e%e3%83%b3%e3%83%89%e3%81%ae%e3%83%a1%e3%83%a2","status":"publish","type":"post","link":"https:\/\/blog.cgfm.jp\/garyu\/archives\/83","title":{"rendered":"svn\u3067\u9593\u9055\u3063\u305f\u30b3\u30df\u30c3\u30c8\u3092merge\u3067\u623b\u3059\u30b3\u30de\u30f3\u30c9\u306e\u30e1\u30e2"},"content":{"rendered":"<p>\u521d\u6b69\u7684\u3059\u304e\u308b\u3051\u3069\u3001\u81ea\u5206\u304c\u307e\u3060\u3088\u304fsvn\u306e\u8003\u3048\u65b9\u3092\u7406\u89e3\u3067\u304d\u3066\u306a\u3044\u306e\u3067\u3001\u5fd8\u308c\u306a\u3044\u3046\u3061\u306b\u30e1\u30e2\u3002<\/p>\n<p>\u6700\u65b0\u7248\u3078\u306e\u30b3\u30df\u30c3\u30c8\u304c\u660e\u3089\u304b\u306b\u30df\u30b9\u3063\u3066\u3066\u3001\u904e\u53bb\u306e\u30ea\u30d3\u30b8\u30e7\u30f3(r999)\u306b\u623b\u3059\u5834\u5408\u3002<br \/>\n[text]svn up  #\u4e00\u5ea6\u6700\u65b0\u7248\u306b\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8<br \/>\nsvn merge -r HEAD:999 .  # \u6700\u65b0\u7248\u2192r999\u306b\u5dee\u5206\u3092\u53d6\u308b\uff1d\u53d6\u308a\u6d88\u3057<br \/>\nsvn commit -m &#8220;r999\u306b\u623b\u3057\u307e\u3057\u305f&#8221;<br \/>\n[\/text]<\/p>\n<p>\u25cb\u53c2\u8003\u30b5\u30a4\u30c8\uff1a <a href=\"http:\/\/subversion.bluegate.org\/doc\/ch04s04.html#svn.branchmerge.commonuses.resurrect\">\u5178\u578b\u7684\u306a\u5229\u7528\u65b9\u6cd5\uff1a\u5909\u66f4\u306e\u53d6\u308a\u6d88\u3057<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u521d\u6b69\u7684\u3059\u304e\u308b\u3051\u3069\u3001\u81ea\u5206\u304c\u307e\u3060\u3088\u304fsvn\u306e\u8003\u3048\u65b9\u3092\u7406\u89e3\u3067\u304d\u3066\u306a\u3044\u306e\u3067\u3001\u5fd8\u308c\u306a\u3044\u3046\u3061\u306b\u30e1\u30e2\u3002 \u6700\u65b0\u7248\u3078\u306e\u30b3\u30df\u30c3\u30c8\u304c\u660e\u3089\u304b\u306b\u30df\u30b9\u3063\u3066\u3066\u3001\u904e\u53bb\u306e\u30ea\u30d3\u30b8\u30e7\u30f3(r999)\u306b\u623b\u3059\u5834\u5408\u3002 [text]svn up #\u4e00\u5ea6\u6700\u65b0\u7248\u306b\u30a2\u30c3\u30d7\u30c7 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"swell_btn_cv_data":"","footnotes":""},"categories":[],"tags":[24,9],"class_list":["post-83","post","type-post","status-publish","format-standard","hentry","tag-trac","tag-memo"],"_links":{"self":[{"href":"https:\/\/blog.cgfm.jp\/garyu\/wp-json\/wp\/v2\/posts\/83","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blog.cgfm.jp\/garyu\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.cgfm.jp\/garyu\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.cgfm.jp\/garyu\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.cgfm.jp\/garyu\/wp-json\/wp\/v2\/comments?post=83"}],"version-history":[{"count":1,"href":"https:\/\/blog.cgfm.jp\/garyu\/wp-json\/wp\/v2\/posts\/83\/revisions"}],"predecessor-version":[{"id":1479,"href":"https:\/\/blog.cgfm.jp\/garyu\/wp-json\/wp\/v2\/posts\/83\/revisions\/1479"}],"wp:attachment":[{"href":"https:\/\/blog.cgfm.jp\/garyu\/wp-json\/wp\/v2\/media?parent=83"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.cgfm.jp\/garyu\/wp-json\/wp\/v2\/categories?post=83"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.cgfm.jp\/garyu\/wp-json\/wp\/v2\/tags?post=83"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}