{"id":3770,"date":"2015-07-07T17:44:22","date_gmt":"2015-07-07T08:44:22","guid":{"rendered":"http:\/\/pchero21.com\/?p=3770"},"modified":"2015-07-07T18:03:08","modified_gmt":"2015-07-07T09:03:08","slug":"git-master-merge-into-devel","status":"publish","type":"post","link":"http:\/\/pchero21.com\/?p=3770","title":{"rendered":"git master merge into devel"},"content":{"rendered":"<p>\uadf8\ub3d9\uc548 git \uc758 devel \ube0c\ub79c\uce58\uc5d0 \ub300\ud574\uc11c \uc57d\uac04 \uc560\ub9e4\ud55c \ubd80\ubd84\uc774 \uc788\uc5c8\ub2e4.<\/p>\n<p>\uc904\uace7 devel \ube0c\ub79c\uce58\ub294 master \ube0c\ub79c\uce58\ub85c merge \ub97c \ub2f9\ud558\ub294 \ucabd\uc774\ub77c\uace0 \uc0dd\uac01\ud55c \uac83\uc774\ub2e4.<\/p>\n<p>\ub9cc\uc57d, devel \ube0c\ub79c\uce58\uc640 master \ube0c\ub79c\uce58\uac00 \uc11c\ub85c \ub2e4\ub978 \uc18c\uc2a4\ub97c \uac00\uc9c0\uac8c \ub418\ub294 \uacbd\uc6b0\uc5d0\ub294 \uc5b4\ub5bb\uac8c \ud560\uae4c?<\/p>\n<p>\uc608\ub97c \ub4e4\uc5b4, \ub9cc\uc57d hotfix \ub97c master \ube0c\ub79c\uce58\uc5d0\ub9cc \uc801\uc6a9\uc744 \ud588\uc744 \uacbd\uc6b0\ub77c\uba74, devel \ube0c\ub79c\uce58\uc5d0\ub294 hotfix\uac00 \uc801\uc6a9\ub418\uc9c0 \uc54a\uac8c\ub41c\ub2e4.<br \/>\n\uc774\ub7f0 \uacbd\uc6b0, devel \ube0c\ub79c\uce58\ub97c master \ube0c\ub79c\uce58\ub85c merge\ub97c \ud558\ub354\ub77c\ub3c4 hotfix \uc5d0 \ub300\ud55c \ub0b4\uc6a9\uc740 devel \ube0c\ub79c\uce58\uc5d0\ub294 \uc801\uc6a9\uc774 \ub418\uc9c0 \uc54a\uac8c \ub41c\ub2e4.<\/p>\n<p>\uc624\ub298, \uc774 \ubb38\uc81c\uc5d0 \ub300\ud574\uc11c \uc9c1\uc7a5\ub3d9\ub8cc Lars \uc5d0\uac8c \ubb3c\uc5b4\ubcf4\uc558\ub2e4. \uc815\ub9d0 \uce5c\uc808\ud558\uac8c \uc815\ub2f5\uc744 \uc54c\ub824\uc8fc\uc5c8\ub2e4.<\/p>\n<p>\uac04\ub2e8\ud588\ub2e4.. \uadf8\ub0e5 devel \ube0c\ub79c\uce58\uc5d0\uc11c master \ube0c\ub79c\uce58 \ub0b4\uc6a9\uc744 merge \ud558\uba74 \ub418\ub294 \uac83\uc774\uc5c8\ub2e4. -_-;;<\/p>\n<blockquote><p>Merge remote-tracking branch &#8216;origin\/master&#8217; into devel<\/p><\/blockquote>\n","protected":false},"excerpt":{"rendered":"<p>\uadf8\ub3d9\uc548 git \uc758 devel \ube0c\ub79c\uce58\uc5d0 \ub300\ud574\uc11c \uc57d\uac04 \uc560\ub9e4\ud55c \ubd80\ubd84\uc774 \uc788\uc5c8\ub2e4. \uc904\uace7 devel \ube0c\ub79c\uce58\ub294 master \ube0c\ub79c\uce58\ub85c merge \ub97c \ub2f9\ud558\ub294 \ucabd\uc774\ub77c\uace0 \uc0dd\uac01\ud55c \uac83\uc774\ub2e4. \ub9cc\uc57d, devel \ube0c\ub79c\uce58\uc640 master \ube0c\ub79c\uce58\uac00 \uc11c\ub85c \ub2e4\ub978 \uc18c\uc2a4\ub97c \uac00\uc9c0\uac8c \ub418\ub294 \uacbd\uc6b0\uc5d0\ub294 \uc5b4\ub5bb\uac8c \ud560\uae4c? \uc608\ub97c \ub4e4\uc5b4, \ub9cc\uc57d hotfix \ub97c master &hellip; <a href=\"http:\/\/pchero21.com\/?p=3770\">Continue reading <span class=\"meta-nav\">&rarr;<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[40],"tags":[965,906,964,963],"_links":{"self":[{"href":"http:\/\/pchero21.com\/index.php?rest_route=\/wp\/v2\/posts\/3770"}],"collection":[{"href":"http:\/\/pchero21.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/pchero21.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/pchero21.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/pchero21.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=3770"}],"version-history":[{"count":2,"href":"http:\/\/pchero21.com\/index.php?rest_route=\/wp\/v2\/posts\/3770\/revisions"}],"predecessor-version":[{"id":3772,"href":"http:\/\/pchero21.com\/index.php?rest_route=\/wp\/v2\/posts\/3770\/revisions\/3772"}],"wp:attachment":[{"href":"http:\/\/pchero21.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3770"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/pchero21.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=3770"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/pchero21.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=3770"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}