{"id":3724,"date":"2015-03-20T11:23:08","date_gmt":"2015-03-20T02:23:08","guid":{"rendered":"http:\/\/www.lancard.com\/blog\/?p=3724"},"modified":"2025-03-12T11:28:06","modified_gmt":"2025-03-12T02:28:06","slug":"git-%e3%83%aa%e3%83%a2%e3%83%bc%e3%83%88%e3%83%aa%e3%83%9d%e3%82%b8%e3%83%88%e3%83%aa%e3%82%92%e3%82%ac%e3%83%84%e3%83%b3%e3%81%a8%e5%b7%bb%e3%81%8d%e6%88%bb%e3%81%99","status":"publish","type":"post","link":"https:\/\/www.lancard.com\/blog\/2015\/03\/20\/git-%e3%83%aa%e3%83%a2%e3%83%bc%e3%83%88%e3%83%aa%e3%83%9d%e3%82%b8%e3%83%88%e3%83%aa%e3%82%92%e3%82%ac%e3%83%84%e3%83%b3%e3%81%a8%e5%b7%bb%e3%81%8d%e6%88%bb%e3%81%99\/","title":{"rendered":"Git \u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u30ac\u30c4\u30f3\u3068\u5dfb\u304d\u623b\u3059"},"content":{"rendered":"<p>\u304b\u306a\u308a\u60a9\u3093\u3067\u6642\u9593\u304c\u304b\u304b\u3063\u305f\u306e\u3067\u30e1\u30e2\u3092\u6b8b\u3057\u3066\u304a\u304d\u307e\u3059\u3002<br \/>\n\u524d\u63d0\u6761\u4ef6\u3068\u3057\u3066\u3001\u57fa\u672c\u3001Git Flow\u30d9\u30fc\u30b9\u3067\u4f5c\u696d\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>\u4e0d\u5e78\u306a\u3053\u3068\u306b\u30ac\u30f3\u30ac\u30f3\u958b\u767a\u3092\u9032\u3081\u3066\u3044\u305fdevelop\u30d6\u30e9\u30f3\u30c1\u3092master\u30d6\u30e9\u30f3\u30c1\u306e\u72b6\u614b\u307e\u3067\u5dfb\u304d\u623b\u3059\u3053\u3068\u306b\u3002master\u30d6\u30e9\u30f3\u30c1\u306b\u306fhotfix\u304c\u5165\u3063\u3066\u305f\u308a\u3082\u3057\u307e\u3059\u3002<\/p>\n<p>\u8abf\u3079\u3066\u8abf\u3079\u3066\u3001\u60a9\u3093\u3067\u3001\u76f8\u8ac7\u3057\u3066\u3001\u8abf\u3079\u3066\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u624b\u9806\u3067\u4f5c\u696d\u3059\u308b\u3053\u3068\u306b\u3057\u307e\u3057\u305f\u3002<\/p>\n<p>hotfix\u524d\u306edevelop\u307e\u3067\u623b\u3059\u3002<\/p>\n<pre lang=\"bash\">\r\n$ git reset --hard \u5dfb\u304d\u623b\u3059\u30b3\u30df\u30c3\u30c8\u306e\u30cf\u30c3\u30b7\u30e5\r\n<\/pre>\n<p>\u30ea\u30e2\u30fc\u30c8\u306edevelop\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u540c\u3058\u6240\u307e\u3067\u5dfb\u304d\u623b\u3059\u3002<\/p>\n<pre lang=\"bash\">\r\n$ git push -f origin HEAD:develop\r\n<\/pre>\n<p>\u305d\u3057\u3066\u3001hotfix\u306b\u3064\u3044\u3066\u306fmaster\u304b\u3089\u5bfe\u8c61\u306e\u30b3\u30df\u30c3\u30c8\u3092\u30c1\u30a7\u30ea\u30fc\u30d4\u30c3\u30af\u3067\u30de\u30fc\u30b8\u3057\u3066\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306bpush(Souce Tree\u3067\u3084\u308a\u307e\u3057\u305f)\u3002<\/p>\n<p>\u305d\u3057\u3066\u3001\u958b\u767a\u8005\u8af8\u6c0f\u306bdevelop\u30d6\u30e9\u30f3\u30c1\u3092\u30ea\u30e2\u30fc\u30c8\u304b\u3089\u53d6\u308a\u76f4\u3059\u3088\u3046\u306b\u9023\u7d61(\u5fd8\u308c\u305a\u306b\uff01)<\/p>\n<p>\u52a0\u3048\u3066\u3001\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u958b\u767a\u7528\u30b5\u30fc\u30d0\u30fc\u306bdevelop\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089<\/p>\n<pre lang=\"bash\">\r\n$ git pull -rebase\r\n<\/pre>\n<p>\u3067\u30c7\u30d7\u30ed\u30a4\u3057\u3066\u3044\u308b\u306e\u3067\u3001\u958b\u767a\u7528\u30b5\u30fc\u30d0\u30fc\u306edevelop\u30ea\u30dd\u30b8\u30c8\u30ea\u3082\u30ed\u30fc\u30ab\u30eb\u3068\u540c\u3058\u30b3\u30de\u30f3\u30c9\u3067\u30ea\u30bb\u30c3\u30c8\u3057\u3066\u30c7\u30d7\u30ed\u30a4\u3057\u306a\u304a\u3057\u307e\u3057\u305f\u3002<\/p>\n<a class=\"synved-social-button synved-social-button-share synved-social-size-24 synved-social-resolution-single synved-social-provider-facebook nolightbox\" data-provider=\"facebook\" target=\"_blank\" rel=\"nofollow\" title=\"Share on Facebook\" href=\"https:\/\/www.facebook.com\/sharer.php?u=https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F3724&#038;t=Git%20%E3%83%AA%E3%83%A2%E3%83%BC%E3%83%88%E3%83%AA%E3%83%9D%E3%82%B8%E3%83%88%E3%83%AA%E3%82%92%E3%82%AC%E3%83%84%E3%83%B3%E3%81%A8%E5%B7%BB%E3%81%8D%E6%88%BB%E3%81%99&#038;s=100&#038;p&#091;url&#093;=https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F3724&#038;p&#091;images&#093;&#091;0&#093;=&#038;p&#091;title&#093;=Git%20%E3%83%AA%E3%83%A2%E3%83%BC%E3%83%88%E3%83%AA%E3%83%9D%E3%82%B8%E3%83%88%E3%83%AA%E3%82%92%E3%82%AC%E3%83%84%E3%83%B3%E3%81%A8%E5%B7%BB%E3%81%8D%E6%88%BB%E3%81%99\" style=\"font-size: 0px;width:24px;height:24px;margin:0;margin-bottom:5px;margin-right:5px\"><img loading=\"lazy\" decoding=\"async\" alt=\"Facebook\" title=\"Share on Facebook\" class=\"synved-share-image synved-social-image synved-social-image-share\" width=\"24\" height=\"24\" style=\"display: inline;width:24px;height:24px;margin: 0;padding: 0;border: none;box-shadow: none\" src=\"https:\/\/www.lancard.com\/blog\/wp-content\/plugins\/social-media-feather\/synved-social\/image\/social\/regular\/48x48\/facebook.png\" \/><\/a><a class=\"synved-social-button synved-social-button-share synved-social-size-24 synved-social-resolution-single synved-social-provider-twitter nolightbox\" data-provider=\"twitter\" target=\"_blank\" rel=\"nofollow\" title=\"Share on Twitter\" href=\"http:\/\/twitter.com\/share?url=https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F3724&#038;text=Git%20%E3%83%AA%E3%83%A2%E3%83%BC%E3%83%88%E3%83%AA%E3%83%9D%E3%82%B8%E3%83%88%E3%83%AA%E3%82%92%E3%82%AC%E3%83%84%E3%83%B3%E3%81%A8%E5%B7%BB%E3%81%8D%E6%88%BB%E3%81%99\" style=\"font-size: 0px;width:24px;height:24px;margin:0;margin-bottom:5px;margin-right:5px\"><img loading=\"lazy\" decoding=\"async\" alt=\"twitter\" title=\"Share on Twitter\" class=\"synved-share-image synved-social-image synved-social-image-share\" width=\"24\" height=\"24\" style=\"display: inline;width:24px;height:24px;margin: 0;padding: 0;border: none;box-shadow: none\" src=\"https:\/\/www.lancard.com\/blog\/wp-content\/plugins\/social-media-feather\/synved-social\/image\/social\/regular\/48x48\/twitter.png\" \/><\/a><a class=\"synved-social-button synved-social-button-share synved-social-size-24 synved-social-resolution-single synved-social-provider-linkedin nolightbox\" data-provider=\"linkedin\" target=\"_blank\" rel=\"nofollow\" title=\"Share on Linkedin\" href=\"https:\/\/www.linkedin.com\/shareArticle?mini=true&#038;url=https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F3724&#038;title=Git%20%E3%83%AA%E3%83%A2%E3%83%BC%E3%83%88%E3%83%AA%E3%83%9D%E3%82%B8%E3%83%88%E3%83%AA%E3%82%92%E3%82%AC%E3%83%84%E3%83%B3%E3%81%A8%E5%B7%BB%E3%81%8D%E6%88%BB%E3%81%99\" style=\"font-size: 0px;width:24px;height:24px;margin:0;margin-bottom:5px;margin-right:5px\"><img loading=\"lazy\" decoding=\"async\" alt=\"linkedin\" title=\"Share on Linkedin\" class=\"synved-share-image synved-social-image synved-social-image-share\" width=\"24\" height=\"24\" style=\"display: inline;width:24px;height:24px;margin: 0;padding: 0;border: none;box-shadow: none\" src=\"https:\/\/www.lancard.com\/blog\/wp-content\/plugins\/social-media-feather\/synved-social\/image\/social\/regular\/48x48\/linkedin.png\" \/><\/a><a class=\"synved-social-button synved-social-button-share synved-social-size-24 synved-social-resolution-single synved-social-provider-tumblr nolightbox\" data-provider=\"tumblr\" target=\"_blank\" rel=\"nofollow\" title=\"Share on tumblr\" href=\"https:\/\/tumblr.com\/share?s=&#038;v=3&#038;t=Git%20%E3%83%AA%E3%83%A2%E3%83%BC%E3%83%88%E3%83%AA%E3%83%9D%E3%82%B8%E3%83%88%E3%83%AA%E3%82%92%E3%82%AC%E3%83%84%E3%83%B3%E3%81%A8%E5%B7%BB%E3%81%8D%E6%88%BB%E3%81%99&#038;u=https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F3724\" style=\"font-size: 0px;width:24px;height:24px;margin:0;margin-bottom:5px;margin-right:5px\"><img loading=\"lazy\" decoding=\"async\" alt=\"tumblr\" title=\"Share on tumblr\" class=\"synved-share-image synved-social-image synved-social-image-share\" width=\"24\" height=\"24\" style=\"display: inline;width:24px;height:24px;margin: 0;padding: 0;border: none;box-shadow: none\" src=\"https:\/\/www.lancard.com\/blog\/wp-content\/plugins\/social-media-feather\/synved-social\/image\/social\/regular\/48x48\/tumblr.png\" \/><\/a><a class=\"synved-social-button synved-social-button-share synved-social-size-24 synved-social-resolution-single synved-social-provider-mail nolightbox\" data-provider=\"mail\" rel=\"nofollow\" title=\"Share by email\" href=\"mailto:?subject=Git%20%E3%83%AA%E3%83%A2%E3%83%BC%E3%83%88%E3%83%AA%E3%83%9D%E3%82%B8%E3%83%88%E3%83%AA%E3%82%92%E3%82%AC%E3%83%84%E3%83%B3%E3%81%A8%E5%B7%BB%E3%81%8D%E6%88%BB%E3%81%99&#038;body=%E3%82%B7%E3%82%A7%E3%82%A2%E3%81%99%E3%82%8B%EF%BC%9A:%20https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F3724\" style=\"font-size: 0px;width:24px;height:24px;margin:0;margin-bottom:5px\"><img loading=\"lazy\" decoding=\"async\" alt=\"mail\" title=\"Share by email\" class=\"synved-share-image synved-social-image synved-social-image-share\" width=\"24\" height=\"24\" style=\"display: inline;width:24px;height:24px;margin: 0;padding: 0;border: none;box-shadow: none\" src=\"https:\/\/www.lancard.com\/blog\/wp-content\/plugins\/social-media-feather\/synved-social\/image\/social\/regular\/48x48\/mail.png\" \/><\/a>","protected":false},"excerpt":{"rendered":"<p>\u304b\u306a\u308a\u60a9\u3093\u3067\u6642\u9593\u304c\u304b\u304b\u3063\u305f\u306e\u3067\u30e1\u30e2\u3092\u6b8b\u3057\u3066\u304a\u304d\u307e\u3059\u3002 \u524d\u63d0\u6761\u4ef6\u3068\u3057\u3066\u3001\u57fa\u672c\u3001Git Flow\u30d9\u30fc\u30b9\u3067\u4f5c\u696d\u3057\u3066\u3044\u307e\u3059\u3002 \u4e0d\u5e78\u306a\u3053\u3068\u306b\u30ac\u30f3\u30ac\u30f3\u958b\u767a\u3092\u9032\u3081\u3066\u3044\u305fdevelop\u30d6\u30e9\u30f3\u30c1\u3092master\u30d6\u30e9\u30f3\u30c1\u306e\u72b6\u614b\u307e\u3067\u5dfb\u304d\u623b\u3059\u3053\u3068 [&hellip;]<\/p>\n","protected":false},"author":12,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[46],"class_list":["post-3724","post","type-post","status-publish","format-standard","hentry","category-1","tag-git"],"_links":{"self":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts\/3724","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/users\/12"}],"replies":[{"embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/comments?post=3724"}],"version-history":[{"count":6,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts\/3724\/revisions"}],"predecessor-version":[{"id":3730,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts\/3724\/revisions\/3730"}],"wp:attachment":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/media?parent=3724"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/categories?post=3724"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/tags?post=3724"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}