{"id":28,"date":"2025-12-11T16:09:21","date_gmt":"2025-12-11T07:09:21","guid":{"rendered":"https:\/\/iromari.tech\/?p=28"},"modified":"2025-12-11T16:09:21","modified_gmt":"2025-12-11T07:09:21","slug":"%e3%80%90git%e3%80%91git-rebase%e6%99%82%e3%81%ae%e3%82%b3%e3%83%b3%e3%83%95%e3%83%aa%e3%82%af%e3%83%88%e8%a7%a3%e6%b6%88%e6%89%8b%e9%a0%86","status":"publish","type":"post","link":"https:\/\/iromari.tech\/?p=28","title":{"rendered":"\u3010Git\u3011git rebase\u6642\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6d88\u624b\u9806"},"content":{"rendered":"\n<h2 class=\"wp-block-heading\">\u306f\u3058\u3081\u306b<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">\u3053\u3093\u306b\u3061\u306f\uff01\u3044\u308d\u307e\u308a\u3067\u3059\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u4eca\u56de\u306fgit rebase\u3092\u884c\u3063\u305f\u969b\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u304d\u305f\u5834\u5408\u306e\u89e3\u6d88\u624b\u9806\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u624b\u9806<\/h2>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u5207\u308a\u5206\u3051\u5143\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u6307\u5b9a\u3057\u3066rebase\uff08\u4ee5\u4e0b\u306fmain\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u5207\u308a\u5206\u3051\u305f\u30d6\u30e9\u30f3\u30c1\u306e\u5834\u5408\uff09<\/li>\n<\/ol>\n\n\n\n<div class=\"hcb_wrap\"><pre class=\"prism line-numbers lang-plain\"><code>git rebase origin\/main<\/code><\/pre><\/div>\n\n\n\n<p class=\"wp-block-paragraph\">2. git status\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u7b87\u6240\u3092\u78ba\u8a8d\u3057\u4fee\u6b63<\/p>\n\n\n\n<div class=\"hcb_wrap\"><pre class=\"prism line-numbers lang-plain\"><code>git status<\/code><\/pre><\/div>\n\n\n\n<p class=\"wp-block-paragraph\">3. \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u7b87\u6240\u3092\u5168\u3066\u4fee\u6b63\u3057\u305f\u3089add\u3092\u884c\u3046<\/p>\n\n\n\n<div class=\"hcb_wrap\"><pre class=\"prism line-numbers lang-plain\"><code>git add .<\/code><\/pre><\/div>\n\n\n\n<p class=\"wp-block-paragraph\">4. \u7d9a\u3051\u3066rebase\u3059\u308b<\/p>\n\n\n\n<div class=\"hcb_wrap\"><pre class=\"prism line-numbers lang-plain\"><code>git rebase --continue<\/code><\/pre><\/div>\n\n\n\n<p class=\"wp-block-paragraph\">\u3053\u306e\u3068\u304d\u3001\u5fc5\u8981\u3067\u3042\u308c\u3070\u30b3\u30df\u30c3\u30c8\u30b3\u30e1\u30f3\u30c8\u3092\u4fee\u6b63\u3059\u308b<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">5. 2-4\u3092\u7e70\u308a\u8fd4\u3057\u3001git status\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u3053\u3089\u306a\u3044\u3053\u3068\u304c\u78ba\u8a8d\u3067\u304d\u308b\u307e\u3067\u7d9a\u3051\u308c\u3070\u5b8c\u4e86\uff01<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u304a\u308f\u308a\u306b<\/h2>\n\n\n\n<p class=\"wp-block-paragraph\">git rebase\u6642\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6d88\u624b\u9806\u306f\u4ee5\u4e0a\u3067\u3059\u3002<\/p>\n\n\n\n<p class=\"wp-block-paragraph\">\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u3055\u3055\u3063\u3068\u89e3\u6d88\u3057\u3066\u958b\u767a\u3092\u9032\u3081\u3066\u3044\u304d\u307e\u3057\u3087\u3046\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u306f\u3058\u3081\u306b \u3053\u3093\u306b\u3061\u306f\uff01\u3044\u308d\u307e\u308a\u3067\u3059\u3002 \u4eca\u56de\u306fgit rebase\u3092\u884c\u3063\u305f\u969b\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u304d\u305f\u5834\u5408\u306e\u89e3\u6d88\u624b\u9806\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002 \u624b\u9806 2. git status\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u7b87\u6240\u3092\u78ba\u8a8d\u3057\u4fee\u6b63 3. \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u7b87\u6240\u3092\u5168\u3066 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":33,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"swell_btn_cv_data":"","footnotes":""},"categories":[6],"tags":[],"class_list":["post-28","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-git"],"_links":{"self":[{"href":"https:\/\/iromari.tech\/index.php?rest_route=\/wp\/v2\/posts\/28","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/iromari.tech\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/iromari.tech\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/iromari.tech\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/iromari.tech\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=28"}],"version-history":[{"count":3,"href":"https:\/\/iromari.tech\/index.php?rest_route=\/wp\/v2\/posts\/28\/revisions"}],"predecessor-version":[{"id":34,"href":"https:\/\/iromari.tech\/index.php?rest_route=\/wp\/v2\/posts\/28\/revisions\/34"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/iromari.tech\/index.php?rest_route=\/wp\/v2\/media\/33"}],"wp:attachment":[{"href":"https:\/\/iromari.tech\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=28"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/iromari.tech\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=28"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/iromari.tech\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=28"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}