{"id":8747,"date":"2023-04-05T15:38:23","date_gmt":"2023-04-05T06:38:23","guid":{"rendered":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/?p=8747"},"modified":"2023-04-05T15:38:23","modified_gmt":"2023-04-05T06:38:23","slug":"git%e3%81%aemerge%e3%81%a8rebase%e3%81%ab%e3%81%a4%e3%81%84%e3%81%a6","status":"publish","type":"post","link":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747","title":{"rendered":"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066"},"content":{"rendered":"
\"\"<\/div>\n

git\u306emerge<\/strong>\u3068rebase<\/strong>\u306f\u3069\u3061\u3089\u3082\uff12\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u3092\u7d71\u5408\u3059\u308b\u65b9\u6cd5\u3067\u3059\u3002<\/p>\n

\u4f7f\u3044\u59cb\u3081\u305f\u5f53\u521d\u306fmerge\u3092\u30e1\u30a4\u30f3\u306b\u4f7f\u3063\u3066\u3044\u307e\u3057\u305f\u304c\u3001\u4f7f\u3044\u5206\u3051\u308b\u3053\u3068\u3067\u4f5c\u696d\u304c\u52b9\u7387\u5316\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3057\u305f\u3002<\/p>\n

merge\u3068rebase\u306e\u9055\u3044\u306b\u3064\u3044\u3066\u307e\u3068\u3081\u3066\u3044\u304d\u307e\u3059\u3002<\/p>\n

\"\"<\/p>\n

\u25a0git merge\u3068\u306f<\/h3>\n

\u300cgit merge\u300d\u306f\u30d6\u30e9\u30f3\u30c1\u306b\u5bfe\u3057\u3066\u3001\u5225\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u5185\u5bb9\u3092\u7d71\u5408\u3059\u308b\u305f\u3081\u306e\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<\/p>\n

 <\/p>\n

\u4e0b\u8a18\u306e\u3088\u3046\u306a2\u3064\u306ebranch\u304c\u5b58\u5728\u3057\u3001\u73fe\u5728\u306ebranch\u304cB\u306e\u6642\u306bA\u3092\u6307\u5b9a\u3057\u3066merge\u3059\u308b\u3068\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n

\"\"<\/p>\n

\u2193\u2193\u2193<\/p>\n

\"\"<\/p>\n

 <\/p>\n

Tortoisegit<\/strong>\u3067\u30ed\u30b0\u3092\u78ba\u8a8d\u3059\u308b\u3068\u4e0b\u8a18\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n

\"\"<\/p>\n

 <\/p>\n

\u25a0git rebase\u3068\u306f<\/h3>\n

\u300cgit rebase\u300d<\/strong>\u306f\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u3092\u5225\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u4ed8\u3051\u66ff\u3048\u308b\u305f\u3081\u306e\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<\/p>\n

merge\u3068\u540c\u69d8\u306b\u3001\u73fe\u5728\u306ebranchi\u304cB\u306e\u6642\u306bA\u3092\u6307\u5b9a\u3057\u3066rebase\u3059\u308b\u3068\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n

 <\/p>\n

\"\"<\/p>\n

\u2193\u2193\u2193<\/p>\n

\"\"<\/p>\n

 <\/p>\n

Tortoisegit<\/strong>\u3067\u30ed\u30b0\u3092\u78ba\u8a8d\u3059\u308b\u3068\u4e0b\u8a18\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n

\"\"<\/p>\n

 <\/p>\n

\u25a0git rebase\u3092\u4f7f\u3063\u305f\u307b\u3046\u304c\u826f\u3044\u30b1\u30fc\u30b9<\/h3>\n

\u30ed\u30fc\u30ab\u30eb\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u4f5c\u696d\u3057\u3066\u3044\u308b\u6700\u4e2d\u306b\u5148\u306b\u9032\u3093\u3060develop\u306e\u5909\u66f4\u3092\u30ed\u30fc\u30ab\u30eb\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u53d6\u308a\u8fbc\u307f\u305f\u3044\u5834\u5408\u306fmerge\u3088\u308arebase\u3092\u4f7f\u3063\u305f\u307b\u3046\u304c\u30ed\u30b0\u3092\u898b\u3084\u3059\u304f\u306a\u308a\u307e\u3059\u3002<\/p>\n

\u307e\u305f\u3001\u7af6\u5408\u306e\u89e3\u6d88\u3082merge\u3088\u308a\u89e3\u6d88\u3057\u3084\u3059\u3044\u304b\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n

 <\/p>\n

\u25a0git rebase\u306e\u6ce8\u610f\u70b9<\/h3>\n

\u4e0a\u8a18\u3068\u306f\u9006\u306bdevelop\u3092\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u306brebase\u3057\u3066\u3057\u307e\u3046\u3068\u3001develop\u306e\u5c65\u6b74\u304c\u306a\u304f\u306a\u308a\u30ed\u30fc\u30ab\u30eb\u30d6\u30e9\u30f3\u30c1\u306e\u3082\u306e\u3068\u306a\u3063\u3066\u3057\u307e\u3044\u307e\u3059\u3002<\/p>\n

 <\/p>\n

\u25a0\u307e\u3068\u3081<\/h3>\n

rebase\u3092\u3059\u308b\u3068\u5c65\u6b74\u304c\u4e00\u76f4\u7dda\u306b\u306a\u308a\u898b\u3084\u3059\u304f\u306a\u308a\u30ec\u30d3\u30e5\u30fc\u3059\u308b\u969b\u3082\u898b\u3084\u3059\u304f\u306a\u308b\u306e\u3067\u3001merge\u3068rebase\u306e\u4f7f\u3044\u5206\u3051\u3092\u30eb\u30fc\u30eb\u5316\u3057\u3066\u30c1\u30fc\u30e0\u5168\u4f53\u306e\u4f5c\u696d\u52b9\u7387\u306e\u5411\u4e0a\u3092\u3057\u3066\u3044\u304d\u305f\u3044\u3068\u8003\u3048\u3066\u3044\u307e\u3059\u3002<\/p>\n

 <\/p>\n

\n

\u25c6WEB\u4f1a\u8b70\uff0f\u30bb\u30df\u30ca\u30fc\u30b7\u30b9\u30c6\u30e0\u300eSzia\u300f
\nhttps:\/\/www.ois-yokohama.co.jp\/szia\/<\/a><\/p>\n

\u25c6\u30b5\u30fc\u30d0\u30b5\u30a4\u30c9\u3067\u52d5\u4f5c\u3059\u308b\u30df\u30c9\u30eb\u30a6\u30a7\u30a2\u300eReDois\u300f
\nhttps:\/\/www.ois-yokohama.co.jp\/redois\/<\/a><\/p>\n

\u25c6AI\u304c\u30c8\u30ec\u30f3\u30c9\u30c8\u30d4\u30c3\u30af\u3092\u3082\u3068\u306b\u3001\u8aad\u307e\u308c\u305d\u3046\u306a\u8a18\u4e8b\u30bf\u30a4\u30c8\u30eb\u3092\u81ea\u52d5\u751f\u6210\u300eAI Title Maker\u300f
\nhttps:\/\/ai-title.ois-yokohama.co.jp\/<\/a><\/p>\n

 <\/p>\n","protected":false},"excerpt":{"rendered":"

git\u306emerge\u3068rebase\u306f\u3069\u3061\u3089\u3082\uff12\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u3092\u7d71\u5408\u3059\u308b\u65b9\u6cd5\u3067\u3059\u3002 \u4f7f\u3044\u59cb\u3081\u305f\u5f53\u521d\u306fmerge\u3092\u30e1\u30a4\u30f3\u306b\u4f7f\u3063\u3066\u3044\u307e\u3057\u305f\u304c\u3001\u4f7f\u3044\u5206\u3051\u308b\u3053\u3068\u3067\u4f5c\u696d\u304c\u52b9\u7387\u5316\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3057\u305f\u3002 merge\u3068rebase\u306e\u9055 […]<\/p>\n","protected":false},"author":1,"featured_media":8754,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"om_disable_all_campaigns":false,"_monsterinsights_skip_tracking":false,"_monsterinsights_sitenote_active":false,"_monsterinsights_sitenote_note":"","_monsterinsights_sitenote_category":0,"vkexunit_cta_each_option":"","footnotes":""},"categories":[6],"tags":[1056,1055,1057],"class_list":["post-8747","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-engineer","tag-git","tag-merge","tag-rebase"],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/posts\/8747","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/comments?post=8747"}],"version-history":[{"count":3,"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/posts\/8747\/revisions"}],"predecessor-version":[{"id":8757,"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/posts\/8747\/revisions\/8757"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/media\/8754"}],"wp:attachment":[{"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/media?parent=8747"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/categories?post=8747"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-json\/wp\/v2\/tags?post=8747"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}