{"id":2317,"date":"2019-10-11T15:31:55","date_gmt":"2019-10-11T06:31:55","guid":{"rendered":"https:\/\/www.beeete2.com\/blog\/?p=2317"},"modified":"2020-01-21T23:14:07","modified_gmt":"2020-01-21T14:14:07","slug":"intellij-idea%ef%bc%88androidstudio%ef%bc%89%e3%81%a7%e3%82%82rebase%e3%81%a8squash%e3%81%a7%e3%81%8d%e3%82%8b%e3%82%88%ef%bc%81","status":"publish","type":"post","link":"https:\/\/www.beeete2.com\/blog\/?p=2317","title":{"rendered":"IntelliJ IDEA\uff08AndroidStudio\uff09\u3067\u3082git rebase squash\u3067\u304d\u308b\u3088\uff01"},"content":{"rendered":"<p>\u666e\u6bb5\u958b\u767a\u3057\u3066\u3044\u308b\u3068Git\u3092\u4f7f\u3063\u3066\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3059\u308b\u3053\u3068\u304c\u591a\u3044\u3068\u601d\u3044\u307e\u3059\u3002<br \/>\n\u305d\u306e\u6642\u306b\u3088\u304f\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u3063\u3066\u3001\u5909\u66f4\u3092\u30ac\u30f3\u30ac\u30f3\u30b3\u30df\u30c3\u30c8\u3057\u3066\u3044\u304d\u307e\u3059\u3002<br \/>\n\u3042\u308b\u7a0b\u5ea6\u5b9f\u88c5\u3057\u3066\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\u6642\u306b\u3001squash\u3057\u3066\u30b3\u30df\u30c3\u30c8\u3092\u4e00\u3064\u306b\u307e\u3068\u3081\u308b\u3068\u304a\u3082\u3046\u306e\u3067\u3059\u304cIntelliJ IDEA\u3067\u3082squash\u3057\u3066\u4e00\u3064\u306e\u30b3\u30df\u30c3\u30c8\u306b\u5909\u66f4\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<br \/>\n\u307e\u305fAndroidStudio\u3067\u3082\u5f53\u7136\u3067\u3059\u304c\u3067\u304d\u307e\u3059\u3002<br \/>\n\u4eca\u56de\u306fAndroidStudio\u3067\u3084\u3063\u3066\u307f\u307e\u3057\u305f\u3002<\/p>\n<h2>squash\u306e\u3084\u308a\u304b\u305f<\/h2>\n<p>\u4f8b\u3048\u3070\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u5834\u5408\u3067\u3059\u3002<br \/>\n<a href=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash1-1.png\"><img decoding=\"async\" class=\"alignnone size-full wp-image-2334\" src=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash1-1.png\" alt=\"\" width=\"975\" height=\"813\" srcset=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash1-1.png 975w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash1-1-300x250.png 300w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash1-1-768x640.png 768w\" sizes=\"(max-width: 975px) 100vw, 975px\" \/><\/a><br \/>\n\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u3075\u3056\u3051\u3066\u3044\u308b\u306e\u306f\u3054\u5bb9\u8d66\u304f\u3060\u3055\u3044\u3002<br \/>\n\u30ed\u30fc\u30ab\u30eb\u3067\u4f5c\u696d\u3059\u308b\u306b\u3057\u3066\u3082\u308f\u304b\u308a\u3084\u3059\u3044\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u597d\u307e\u3057\u3044\u3067\u3059\u3002<\/p>\n<p>\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u64cd\u4f5c\u3059\u308b\u305f\u3081\u5f53\u7136\u3067\u3059\u304c\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u3067\u884c\u3063\u3066\u304f\u3060\u3055\u3044\u3002<br \/>\n\u30ea\u30e2\u30fc\u30c8\u306b\u30d7\u30c3\u30b7\u30e5\u3057\u3066\u3042\u308b\u30d6\u30e9\u30f3\u30c1\u3067\u64cd\u4f5c\u3059\u308b\u3068\u304a\u304b\u3057\u304f\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>IntelliJ\u306e\u30e1\u30cb\u30e5\u30fc\u304b\u3089VCS -&gt; rebase\u3092\u9078\u629e\u3057\u307e\u3059\u3002<br \/>\n\u3059\u308b\u3068\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u753b\u9762\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002<br \/>\n<a href=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash2.png\"><img decoding=\"async\" class=\"alignnone size-full wp-image-2336\" src=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash2.png\" alt=\"\" width=\"790\" height=\"485\" srcset=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash2.png 790w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash2-300x184.png 300w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash2-768x471.png 768w\" sizes=\"(max-width: 790px) 100vw, 790px\" \/><\/a><br \/>\n\u4eca\u56de\u306fdevelop\u30d6\u30e9\u30f3\u30c1\u306e\u5185\u5bb9\u3092\u4e00\u3064\u306b\u307e\u3068\u3081\u305f\u3044\u306e\u3067branch\u306b\u306f<code>develop<\/code>\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002<br \/>\nonto\u306f<code>master<\/code>\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002onto\u306b\u6307\u5b9a\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u304c\u793a\u3059\u30b3\u30df\u30c3\u30c8\u306e\u4e0a\u306b\u5909\u66f4\u304c\u30b3\u30df\u30c3\u30c8\u3055\u308c\u307e\u3059\u3002\u8aac\u660e\u304c\u96e3\u3057\u3044\u30fb\u30fb\u3002<br \/>\n\u6307\u5b9a\u3057\u305f\u3089<code>Rebase<\/code>\u3092\u30af\u30ea\u30c3\u30af\u3057\u307e\u3059\u3002<\/p>\n<p>\u3059\u308b\u3068\u5bfe\u8c61\u306b\u306a\u308b\u30b3\u30df\u30c3\u30c8\u4e00\u89a7\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002<br \/>\n\u3053\u3053\u3067Action\u3092squash\u306b\u3057\u3066\u3044\u304d\u307e\u3059\u3002<br \/>\n<a href=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash3.png\"><img decoding=\"async\" class=\"alignnone size-full wp-image-2337\" src=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash3.png\" alt=\"\" width=\"940\" height=\"937\" srcset=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash3.png 940w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash3-150x150.png 150w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash3-300x300.png 300w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash3-768x766.png 768w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash3-100x100.png 100w\" sizes=\"(max-width: 940px) 100vw, 940px\" \/><\/a><\/p>\n<p>\u3055\u3059\u304cIntellJ\u3055\u3093\u3001\u5f53\u7136\u306e\u3088\u3046\u306b\u8907\u6570\u9078\u629e\u306b\u5bfe\u5fdc\u3057\u3066\u307e\u3059\u3002<br \/>\n\u5bfe\u8c61\u3068\u306a\u308b\u30b3\u30df\u30c3\u30c8\u3092\u9078\u629e\u3057\u3066\u53f3\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7\u30e1\u30cb\u30e5\u30fc\u304c\u8868\u793a\u3055\u308c\u308b\u306e\u3067\u4eca\u56de\u306fsquash\u3092\u9078\u629e\u3057\u307e\u3059\u3002<br \/>\n<a href=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash4.png\"><img decoding=\"async\" class=\"alignnone size-full wp-image-2339\" src=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash4.png\" alt=\"\" width=\"940\" height=\"937\" srcset=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash4.png 940w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash4-150x150.png 150w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash4-300x300.png 300w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash4-768x766.png 768w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash4-100x100.png 100w\" sizes=\"(max-width: 940px) 100vw, 940px\" \/><\/a><\/p>\n<p>\u7121\u4e8b\u306bsquash\u304c\u8a2d\u5b9a\u3055\u308c\u307e\u3057\u305f\u3002<br \/>\n<a href=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash5.png\"><img decoding=\"async\" class=\"alignnone size-full wp-image-2341\" src=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash5.png\" alt=\"\" width=\"940\" height=\"937\" srcset=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash5.png 940w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash5-150x150.png 150w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash5-300x300.png 300w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash5-768x766.png 768w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash5-100x100.png 100w\" sizes=\"(max-width: 940px) 100vw, 940px\" \/><\/a><\/p>\n<p>Start Rebase\u30dc\u30bf\u30f3\u3092\u62bc\u3059\u3068\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u5165\u529b\u3092\u6c42\u3081\u3089\u308c\u308b\u306e\u3067\u5165\u529b\u3057\u307e\u3059\u3002<br \/>\n<a href=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash6.png\"><img decoding=\"async\" class=\"alignnone size-full wp-image-2342\" src=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash6.png\" alt=\"\" width=\"694\" height=\"1166\" srcset=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash6.png 694w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash6-179x300.png 179w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash6-609x1024.png 609w\" sizes=\"(max-width: 694px) 100vw, 694px\" \/><\/a><\/p>\n<p>\u3059\u308b\u3068\u3053\u3093\u306a\u611f\u3058\u3067squash\u304c\u884c\u308f\u308c\u3066\u30b3\u30df\u30c3\u30c8\u304c\u4e00\u3064\u306b\u306a\u308a\u307e\u3057\u305f\u3002<br \/>\n<a href=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash7.png\"><img decoding=\"async\" class=\"alignnone size-full wp-image-2344\" src=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash7.png\" alt=\"\" width=\"855\" height=\"804\" srcset=\"https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash7.png 855w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash7-300x282.png 300w, https:\/\/www.beeete2.com\/blog\/wp-content\/uploads\/2019\/10\/intellij_squash7-768x722.png 768w\" sizes=\"(max-width: 855px) 100vw, 855px\" \/><\/a><\/p>\n<p>\u3042\u3068\u306f\u30ea\u30e2\u30fc\u30c8\u306b\u30d7\u30c3\u30b7\u30e5\u3059\u308b\u306a\u308a\u30de\u30fc\u30b8\u3059\u308b\u306a\u308a\u3059\u308b\u3068\u826f\u3044\u3067\u3059\u3002<\/p>\n<h2>\u307e\u3068\u3081<\/h2>\n<p>\u3082\u3061\u308d\u3093git\u30b3\u30de\u30f3\u30c9\u3067\u3082\u3067\u304d\u308b\u306e\u3067\u3059\u304c\u3001\u81ea\u5206\u306fIntelliJ\u3092\u4f7f\u3063\u305f\u307b\u3046\u304c\u697d\u306a\u306e\u3067\u6700\u8fd1\u306fGUI\u3092\u4f7f\u3063\u3066\u3044\u307e\u3059\u3002<br \/>\nGitKraken\u306f\u66f4\u306b\u7c21\u5358\u3067GUI\u306e\u30d2\u30b9\u30c8\u30ea\u30fc\u4e0a\u304b\u3089\u30b3\u30df\u30c3\u30c8\u3092\u9078\u629e\u3057\u3066squash\u3067\u304d\u305f\u3088\u3046\u306a\u6c17\u304c\u3057\u307e\u3059\u3002<br \/>\n\u306a\u304aSourceTree\u3067squash\u3059\u308b\u3084\u308a\u65b9\u304c\u672a\u3060\u306b\u308f\u304b\u3089\u306a\u3044\u3067\u3059\u30fb\u30fb\u30fb\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u666e\u6bb5\u958b\u767a\u3057\u3066\u3044\u308b\u3068Git\u3092\u4f7f\u3063\u3066\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u3059\u308b\u3053\u3068\u304c\u591a\u3044\u3068\u601d\u3044\u307e\u3059\u3002 \u305d\u306e\u6642\u306b\u3088\u304f\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u3063\u3066\u3001\u5909\u66f4\u3092\u30ac\u30f3\u30ac\u30f3\u30b3\u30df\u30c3\u30c8\u3057\u3066\u3044\u304d\u307e\u3059\u3002 \u3042\u308b\u7a0b\u5ea6\u5b9f\u88c5\u3057\u3066\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\u6642\u306b\u3001 &#8230; <\/p>\n","protected":false},"author":1,"featured_media":1101,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[84],"tags":[],"views":5910,"_links":{"self":[{"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/2317"}],"collection":[{"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=2317"}],"version-history":[{"count":13,"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/2317\/revisions"}],"predecessor-version":[{"id":2462,"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/2317\/revisions\/2462"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=\/wp\/v2\/media\/1101"}],"wp:attachment":[{"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=2317"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=2317"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.beeete2.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=2317"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}