{"id":8118,"date":"2019-12-08T12:52:33","date_gmt":"2019-12-08T03:52:33","guid":{"rendered":"http:\/\/www.code-magagine.com\/?p=8118"},"modified":"2023-05-07T09:24:49","modified_gmt":"2023-05-07T00:24:49","slug":"%e3%80%90git%e3%80%91%e3%80%8c%e3%83%97%e3%83%ab%e3%83%aa%e3%82%af%e3%82%a8%e3%82%b9%e3%83%88%e3%80%8d%e6%99%82%e3%81%abmaster%e3%83%96%e3%83%a9%e3%83%b3%e3%83%81%e3%81%a8%e5%b7%ae%e5%88%86%e3%81%8c","status":"publish","type":"post","link":"http:\/\/www.code-magagine.com\/?p=8118","title":{"rendered":"\u3010Git\u3011\u300c\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u300d\u6642\u306bmaster\u30d6\u30e9\u30f3\u30c1\u3068\u5dee\u5206\u304c\u3042\u3063\u305f\u5834\u5408"},"content":{"rendered":"<p>Git\u3067\u30ed\u30fc\u30ab\u30eb\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u5185\u5bb9\u3092\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u3057\u3088\u3046\u3068\u3057\u305f\u969b\u306bmaster\u30d6\u30e9\u30f3\u30c1\u306e\u65b9\u304c\u5148\u306b\u9032\u3093\u3067\u3057\u307e\u3063\u3066\u3044\u308b\u5834\u5408\u304c\u591a\u3005\u3042\u308a\u307e\u3059\u3002\u305d\u306e\u5834\u5408\u306f\u57fa\u672c\u7684\u306b<span style=\"color: #ff0000;\"><strong>\u5909\u66f4\u5dee\u5206\u3092\u5438\u53ce\u3057\u305f\u4e0a\u3067\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u304c\u3067\u304d\u308b\u306e\u304c\u671b\u307e\u3057\u3044<\/strong><\/span>\u3067\u3059\u3002<\/p>\n<p>\u57fa\u672c\u306f\u4e0b\u8a18\u306e\u3069\u3061\u3089\u304b\u306e\u65b9\u6cd5\u3092\u3068\u308a\u307e\u3059\u3002<\/p>\n<ul>\n<li>\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u3092master\u30d6\u30e9\u30f3\u30c1\u306brebase(\u30ea\u30d9\u30fc\u30b9)\u3057\u305f\u72b6\u614b\u3067\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3059\u308b\u3002<\/li>\n<li>master\u30d6\u30e9\u30f3\u30c1\u3092\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3057\u305f\u72b6\u614b\u3067\u30ec\u30d3\u30e5\u30fc\u3057\u3066\u3082\u3089\u3046\u3002<\/li>\n<\/ul>\n<h2>\u30ea\u30d9\u30fc\u30b9\u3092\u7528\u3044\u305f\u65b9\u6cd5<\/h2>\n<p>\u4e0b\u8a18\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u3066\u30ea\u30d9\u30fc\u30b9\u3057\u307e\u3059\u3002<\/p>\n<pre class=\"lang:default decode:true\">git checkout feature\u30d6\u30e9\u30f3\u30c1\r\ngit rebase master<\/pre>\n<p>\u3059\u308b\u3068\u53e4\u3044master\u30d6\u30e9\u30f3\u30c1\u3058\u3083\u306a\u304f<span style=\"color: #ff0000;\"><strong>\u6700\u65b0\u306emaster\u30d6\u30e9\u30f3\u30c1\u306e\u30b1\u30c4\u304b\u3089\u4eca\u56de\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u3067\u4fee\u6b63\u3092\u52a0\u3048\u305f\u5185\u5bb9\u304c\u53cd\u6620\u3055\u308c\u305f\u72b6\u614b\u3092\u4f5c\u3063\u3066\u304f\u308c\u307e\u3059\u3002<\/strong><\/span><\/p>\n<h3>\u30e1\u30ea\u30c3\u30c8<\/h3>\n<h4>\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u304c\u4e00\u672c\u9053\u3067\u308f\u304b\u308a\u3084\u3059\u3044\u3002<\/h4>\n<p>\u8907\u6570\u4eba\u3067\u306e\u958b\u767a\u306e\u5834\u5408\u306f\u5c65\u6b74\u3092\u78ba\u5b9f\u306b\u6b8b\u3057\u305f\u3044\u3068\u601d\u3046\u306e\u3067\u30de\u30fc\u30b8\u3088\u308a\u3082\u512a\u308c\u3066\u3044\u308b\u3068\u8a00\u3048\u307e\u3059\u3002<\/p>\n<h3>\u30c7\u30e1\u30ea\u30c3\u30c8<\/h3>\n<ul>\n<li>\u3059\u3067\u306b\u540c\u3058\u540d\u524d\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u30ea\u30e2\u30fc\u30c8\u306b\u3042\u308b\u5834\u5408\u306f\u300cpush -f\u300d\u3092\u4f7f\u3046\u5fc5\u8981\u304c\u3042\u308b\u3002<\/li>\n<li>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u5834\u5408\u306f\u89e3\u6d88\u5185\u5bb9\u304c\u305d\u308c\u305e\u308c\u306e\u30b3\u30df\u30c3\u30c8\u306b\u6df7\u3056\u3063\u3066\u3057\u307e\u3046\u3002<\/li>\n<\/ul>\n<h2>master\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\u65b9\u6cd5<\/h2>\n<h3>\u624b\u9806<\/h3>\n<ul>\n<li>\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306emaster\u30d6\u30e9\u30f3\u30c1\u3092\u6700\u65b0\u5316\u3059\u308b\u3002<\/li>\n<li>\u30ed\u30fc\u30ab\u30eb\u306emaster\u30d6\u30e9\u30f3\u30c1\u3068\u30ed\u30fc\u30ab\u30eb\u306e\u4fee\u6b63\u4e2d\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u3059\u308b\u3002<\/li>\n<li>\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3059\u308b\u3002<\/li>\n<\/ul>\n<h3>\u30e1\u30ea\u30c3\u30c8<\/h3>\n<ul>\n<li>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6d88\u3092\u884c\u3063\u305f\u5834\u5408\u306f\u89e3\u6d88\u5185\u5bb9\u304c\u4e00\u3064\u306e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306e\u4e2d\u306b\u307e\u3068\u307e\u308a\u30ec\u30d3\u30e5\u30fc\u3057\u3084\u3059\u3044\u3002<\/li>\n<\/ul>\n<h3>\u30c7\u30e1\u30ea\u30c3\u30c8<\/h3>\n<h4>\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u304c\u4e00\u672c\u9053\u306b\u306a\u3089\u306a\u3044\u3002<\/h4>\n<p>feature\u3068\u306f\u7121\u95a2\u4fc2\u306e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u53d6\u308a\u8fbc\u307e\u308c\u308b\u3053\u3068\u306b\u306a\u308b\u306e\u3067\u5f8c\u3067\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u3092\u898b\u305f\u3068\u304d\u306b\u300c\u4f55\u306e\u30b3\u30df\u30c3\u30c8\u3060\uff1f\u300d\u3068\u7591\u554f\u304c\u751f\u307e\u308c\u3066\u3057\u307e\u3046\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u7279\u306b\u3001master\u30d6\u30e9\u30f3\u30c1\u3078\u306e\u30de\u30fc\u30b8\u304c\u6d3b\u767a\u306a\u6848\u4ef6\u3068\u304b\u3067\u3042\u308c\u3070\u3088\u308a\u305d\u308c\u304c\u9855\u8457\u306b\u306a\u3063\u3066\u3057\u307e\u3046\u3053\u3068\u3067\u3057\u3087\u3046\u3002<\/p>\n<h2>\u307e\u3068\u3081<\/h2>\n<p>rebase\u306f\u5c11\u3057\u64cd\u4f5c\u3092\u9593\u9055\u3046\u3068\u30c8\u30e9\u30d6\u30eb\u306e\u5143\u306b\u306a\u3063\u3066\u3057\u307e\u3044\u307e\u3059\u306e\u3067\u3001\u3042\u308b\u7a0b\u5ea6Git\u306e\u77e5\u8b58\u304c\u5fc5\u8981\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u305f\u3060\u3001\u57fa\u672c\u7684\u306b\u306f\u30de\u30fc\u30b8\u3092\u4f7f\u3046\u3088\u308a\u306f\u4f7f\u3048\u308b\u306e\u3067\u3042\u308c\u3070rebase\u306e\u65b9\u304c\u3088\u308a\u671b\u307e\u3057\u3044\u3068\u8a00\u3048\u308b\u3067\u3057\u3087\u3046\u3002<\/p>\n<p>\u305f\u3060\u3001\u307e\u3060Git\u306e\u7d4c\u9a13\u306e\u6d45\u3044\u30e1\u30f3\u30d0\u30fc\u304c\u591a\u3044\u5834\u5408\u306frebase\u3067\u306f\u306a\u304f\u3066\u30de\u30fc\u30b8\u3092\u4f7f\u3046\u3068\u3044\u3046\u3088\u3046\u306a\u5f62\u304c\u671b\u307e\u3057\u3044\u3068\u601d\u3044\u307e\u3059\u3002\uff08\u305d\u306e\u5834\u5408git\u306e\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u304c\u3057\u3063\u304b\u308a\u3068\u6b8b\u3089\u306a\u3044\u306e\u3067\u5bc6\u306bslack\u306a\u3069\u3067\u30b3\u30df\u30e5\u30cb\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u53d6\u308b\u3053\u3068\u304c\u8981\u6c42\u3055\u308c\u307e\u3059\u3002\uff09<\/p>\n","protected":false},"excerpt":{"rendered":"Git\u3067\u30ed\u30fc\u30ab\u30eb\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u5185\u5bb9\u3092\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u3057\u3088\u3046\u3068\u3057\u305f\u969b\u306bmaster\u30d6\u30e9\u30f3\u30c1\u306e\u65b9\u304c\u5148\u306b\u9032\u3093\u3067\u3057\u307e\u3063\u3066\u3044\u308b\u5834\u5408\u304c\u591a\u3005\u3042\u308a\u307e\u3059\u3002\u305d\u306e\u5834\u5408\u306f\u57fa\u672c\u7684\u306b\u5909\u66f4\u5dee\u5206\u3092\u5438\u53ce\u3057\u305f\u4e0a\u3067\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u304c\u3067\u304d\u308b\u306e\u304c\u671b\u307e\u3057\u3044\u3067\u3059\u3002  [&hellip;]","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[32],"tags":[],"_links":{"self":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts\/8118"}],"collection":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=8118"}],"version-history":[{"count":5,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts\/8118\/revisions"}],"predecessor-version":[{"id":19550,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts\/8118\/revisions\/19550"}],"wp:attachment":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=8118"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=8118"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=8118"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}