{"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 class=\"veu_autoEyeCatchBox\"><img loading=\"lazy\" decoding=\"async\" width=\"750\" height=\"500\" src=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m-1024x683.jpg\" class=\"attachment-large size-large wp-post-image\" alt=\"\" srcset=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m-1024x683.jpg 1024w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m-300x200.jpg 300w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m-768x512.jpg 768w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m-1536x1024.jpg 1536w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m.jpg 1920w\" sizes=\"auto, (max-width: 750px) 100vw, 750px\" \/><\/div>\n<p>git\u306e<strong>merge<\/strong>\u3068<strong>rebase<\/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<p>\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<p>merge\u3068rebase\u306e\u9055\u3044\u306b\u3064\u3044\u3066\u307e\u3068\u3081\u3066\u3044\u304d\u307e\u3059\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-large wp-image-8754\" src=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m-1024x683.jpg\" alt=\"\" width=\"1024\" height=\"683\" srcset=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m-1024x683.jpg 1024w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m-300x200.jpg 300w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m-768x512.jpg 768w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m-1536x1024.jpg 1536w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m.jpg 1920w\" sizes=\"auto, (max-width: 1024px) 100vw, 1024px\" \/><\/p>\n<h3>\u25a0git merge\u3068\u306f<\/h3>\n<p>\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>&nbsp;<\/p>\n<p>\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><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-full wp-image-8748\" src=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/1.png\" alt=\"\" width=\"544\" height=\"92\" srcset=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/1.png 544w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/1-300x51.png 300w\" sizes=\"auto, (max-width: 544px) 100vw, 544px\" \/><\/p>\n<p>\u2193\u2193\u2193<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-full wp-image-8749\" src=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/2.png\" alt=\"\" width=\"639\" height=\"92\" srcset=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/2.png 639w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/2-300x43.png 300w\" sizes=\"auto, (max-width: 639px) 100vw, 639px\" \/><\/p>\n<p>&nbsp;<\/p>\n<p><strong>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><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-large wp-image-8750\" src=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/3-1024x730.png\" alt=\"\" width=\"1024\" height=\"730\" srcset=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/3-1024x730.png 1024w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/3-300x214.png 300w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/3-768x547.png 768w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/3.png 1155w\" sizes=\"auto, (max-width: 1024px) 100vw, 1024px\" \/><\/p>\n<p>&nbsp;<\/p>\n<h3>\u25a0git rebase\u3068\u306f<\/h3>\n<p><strong>\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<p>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>&nbsp;<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-full wp-image-8751\" src=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/4.png\" alt=\"\" width=\"544\" height=\"92\" srcset=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/4.png 544w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/4-300x51.png 300w\" sizes=\"auto, (max-width: 544px) 100vw, 544px\" \/><\/p>\n<p>\u2193\u2193\u2193<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-full wp-image-8752\" src=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/5.png\" alt=\"\" width=\"752\" height=\"92\" srcset=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/5.png 752w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/5-300x37.png 300w\" sizes=\"auto, (max-width: 752px) 100vw, 752px\" \/><\/p>\n<p>&nbsp;<\/p>\n<p><strong>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><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-large wp-image-8753\" src=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/6-1024x730.png\" alt=\"\" width=\"1024\" height=\"730\" srcset=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/6-1024x730.png 1024w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/6-300x214.png 300w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/6-768x547.png 768w, https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/6.png 1155w\" sizes=\"auto, (max-width: 1024px) 100vw, 1024px\" \/><\/p>\n<p>&nbsp;<\/p>\n<h3>\u25a0git rebase\u3092\u4f7f\u3063\u305f\u307b\u3046\u304c\u826f\u3044\u30b1\u30fc\u30b9<\/h3>\n<p>\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<p>\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>&nbsp;<\/p>\n<h3>\u25a0git rebase\u306e\u6ce8\u610f\u70b9<\/h3>\n<p>\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>&nbsp;<\/p>\n<h3>\u25a0\u307e\u3068\u3081<\/h3>\n<p>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>&nbsp;<\/p>\n<hr \/>\n<p>\u25c6WEB\u4f1a\u8b70\uff0f\u30bb\u30df\u30ca\u30fc\u30b7\u30b9\u30c6\u30e0\u300eSzia\u300f<br \/>\n<a href=\"https:\/\/www.ois-yokohama.co.jp\/szia\/\" target=\"_blank\" rel=\"noopener noreferrer\">https:\/\/www.ois-yokohama.co.jp\/szia\/<\/a><\/p>\n<p>\u25c6\u30b5\u30fc\u30d0\u30b5\u30a4\u30c9\u3067\u52d5\u4f5c\u3059\u308b\u30df\u30c9\u30eb\u30a6\u30a7\u30a2\u300eReDois\u300f<br \/>\n<a href=\"https:\/\/www.ois-yokohama.co.jp\/redois\/\" target=\"_blank\" rel=\"noopener noreferrer\">https:\/\/www.ois-yokohama.co.jp\/redois\/<\/a><\/p>\n<p>\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<br \/>\n<a href=\"https:\/\/ai-title.ois-yokohama.co.jp\/\" target=\"_blank\" rel=\"noopener noreferrer\">https:\/\/ai-title.ois-yokohama.co.jp\/<\/a><\/p>\n<p>&nbsp;<\/p>\n","protected":false},"excerpt":{"rendered":"<p>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 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":8754,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_monsterinsights_skip_tracking":false,"sns_share_botton_hide":"","vkExUnit_sns_title":"","_vk_print_noindex":"","sitemap_hide":"","vkExUnit_EyeCatch_disable":"","_veu_custom_css":"","veu_display_promotion_alert":"","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":[],"aioseo_head":"\n\t\t<!-- All in One SEO 4.9.10 - aioseo.com -->\n\t<meta name=\"robots\" content=\"max-image-preview:large\" \/>\n\t<meta name=\"author\" content=\"akiyama\"\/>\n\t<link rel=\"canonical\" href=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747\" \/>\n\t<meta name=\"generator\" content=\"All in One SEO (AIOSEO) 4.9.10\" \/>\n\t\t<meta property=\"og:locale\" content=\"ja_JP\" \/>\n\t\t<meta property=\"og:site_name\" content=\"OIS\u30d6\u30ed\u30b0 | OIS\u306e\u30d6\u30ed\u30b0\u7d39\u4ecb\" \/>\n\t\t<meta property=\"og:type\" content=\"article\" \/>\n\t\t<meta property=\"og:title\" content=\"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066 | OIS\u30d6\u30ed\u30b0\" \/>\n\t\t<meta property=\"og:url\" content=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747\" \/>\n\t\t<meta property=\"og:image\" content=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m.jpg\" \/>\n\t\t<meta property=\"og:image:secure_url\" content=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m.jpg\" \/>\n\t\t<meta property=\"og:image:width\" content=\"1920\" \/>\n\t\t<meta property=\"og:image:height\" content=\"1280\" \/>\n\t\t<meta property=\"article:published_time\" content=\"2023-04-05T06:38:23+00:00\" \/>\n\t\t<meta property=\"article:modified_time\" content=\"2023-04-05T06:38:23+00:00\" \/>\n\t\t<meta property=\"article:publisher\" content=\"https:\/\/www.facebook.com\/orientalinformationservice\" \/>\n\t\t<meta name=\"twitter:card\" content=\"summary\" \/>\n\t\t<meta name=\"twitter:site\" content=\"@ois_yokohama\" \/>\n\t\t<meta name=\"twitter:title\" content=\"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066 | OIS\u30d6\u30ed\u30b0\" \/>\n\t\t<meta name=\"twitter:creator\" content=\"@ois_yokohama\" \/>\n\t\t<meta name=\"twitter:image\" content=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m.jpg\" \/>\n\t\t<script type=\"application\/ld+json\" class=\"aioseo-schema\">\n\t\t\t{\"@context\":\"https:\\\/\\\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747#article\",\"name\":\"git\\u306emerge\\u3068rebase\\u306b\\u3064\\u3044\\u3066 | OIS\\u30d6\\u30ed\\u30b0\",\"headline\":\"git\\u306emerge\\u3068rebase\\u306b\\u3064\\u3044\\u3066\",\"author\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/author\\\/akiyama#author\"},\"publisher\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/#organization\"},\"image\":{\"@type\":\"ImageObject\",\"url\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/wp-content\\\/uploads\\\/2023\\\/04\\\/26027758_m.jpg\",\"width\":1920,\"height\":1280},\"datePublished\":\"2023-04-05T15:38:23+09:00\",\"dateModified\":\"2023-04-05T15:38:23+09:00\",\"inLanguage\":\"ja\",\"mainEntityOfPage\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747#webpage\"},\"isPartOf\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747#webpage\"},\"articleSection\":\"\\u6280\\u8853\\u8b1b\\u7fd2, Git, merge, rebase\"},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747#breadcrumblist\",\"itemListElement\":[{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018#listItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\",\"nextItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/category\\\/engineer#listItem\",\"name\":\"\\u6280\\u8853\\u8b1b\\u7fd2\"}},{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/category\\\/engineer#listItem\",\"position\":2,\"name\":\"\\u6280\\u8853\\u8b1b\\u7fd2\",\"item\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/category\\\/engineer\",\"nextItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747#listItem\",\"name\":\"git\\u306emerge\\u3068rebase\\u306b\\u3064\\u3044\\u3066\"},\"previousItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018#listItem\",\"name\":\"Home\"}},{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747#listItem\",\"position\":3,\"name\":\"git\\u306emerge\\u3068rebase\\u306b\\u3064\\u3044\\u3066\",\"previousItem\":{\"@type\":\"ListItem\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/category\\\/engineer#listItem\",\"name\":\"\\u6280\\u8853\\u8b1b\\u7fd2\"}}]},{\"@type\":\"Organization\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/#organization\",\"name\":\"OIS\\u30d6\\u30ed\\u30b0\",\"description\":\"OIS\\u306e\\u30d6\\u30ed\\u30b0\\u7d39\\u4ecb\",\"url\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/\",\"logo\":{\"@type\":\"ImageObject\",\"url\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/wp-content\\\/uploads\\\/2025\\\/09\\\/OIS\\u30ed\\u30b4-\\u6587\\u5b57\\u306a\\u3057.png\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747\\\/#organizationLogo\",\"width\":128,\"height\":128},\"image\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747\\\/#organizationLogo\"},\"sameAs\":[\"https:\\\/\\\/www.facebook.com\\\/orientalinformationservice\",\"https:\\\/\\\/x.com\\\/ois_yokohama\",\"https:\\\/\\\/www.instagram.com\\\/ois_yokohama1978\\\/\"]},{\"@type\":\"Person\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/author\\\/akiyama#author\",\"url\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/author\\\/akiyama\",\"name\":\"akiyama\",\"image\":{\"@type\":\"ImageObject\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747#authorImage\",\"url\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/ff5bd4b5c6242b44911d761454b7fa2ee660c3e49a42278fda2507916d9816d2?s=96&d=mm&r=g\",\"width\":96,\"height\":96,\"caption\":\"akiyama\"}},{\"@type\":\"WebPage\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747#webpage\",\"url\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747\",\"name\":\"git\\u306emerge\\u3068rebase\\u306b\\u3064\\u3044\\u3066 | OIS\\u30d6\\u30ed\\u30b0\",\"inLanguage\":\"ja\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/#website\"},\"breadcrumb\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747#breadcrumblist\"},\"author\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/author\\\/akiyama#author\"},\"creator\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/author\\\/akiyama#author\"},\"image\":{\"@type\":\"ImageObject\",\"url\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/wp-content\\\/uploads\\\/2023\\\/04\\\/26027758_m.jpg\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747\\\/#mainImage\",\"width\":1920,\"height\":1280},\"primaryImageOfPage\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/archives\\\/8747#mainImage\"},\"datePublished\":\"2023-04-05T15:38:23+09:00\",\"dateModified\":\"2023-04-05T15:38:23+09:00\"},{\"@type\":\"WebSite\",\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/#website\",\"url\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/\",\"name\":\"OIS\\u30d6\\u30ed\\u30b0\",\"description\":\"OIS\\u306e\\u30d6\\u30ed\\u30b0\\u7d39\\u4ecb\",\"inLanguage\":\"ja\",\"publisher\":{\"@id\":\"https:\\\/\\\/www.ois-yokohama.co.jp\\\/oisblog2018\\\/#organization\"}}]}\n\t\t<\/script>\n\t\t<!-- All in One SEO -->\n\n","aioseo_head_json":{"title":"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066 | OIS\u30d6\u30ed\u30b0","description":"","canonical_url":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747","robots":"max-image-preview:large","keywords":"","webmasterTools":{"miscellaneous":""},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747#article","name":"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066 | OIS\u30d6\u30ed\u30b0","headline":"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066","author":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/author\/akiyama#author"},"publisher":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/#organization"},"image":{"@type":"ImageObject","url":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m.jpg","width":1920,"height":1280},"datePublished":"2023-04-05T15:38:23+09:00","dateModified":"2023-04-05T15:38:23+09:00","inLanguage":"ja","mainEntityOfPage":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747#webpage"},"isPartOf":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747#webpage"},"articleSection":"\u6280\u8853\u8b1b\u7fd2, Git, merge, rebase"},{"@type":"BreadcrumbList","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747#breadcrumblist","itemListElement":[{"@type":"ListItem","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018#listItem","position":1,"name":"Home","item":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018","nextItem":{"@type":"ListItem","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/category\/engineer#listItem","name":"\u6280\u8853\u8b1b\u7fd2"}},{"@type":"ListItem","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/category\/engineer#listItem","position":2,"name":"\u6280\u8853\u8b1b\u7fd2","item":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/category\/engineer","nextItem":{"@type":"ListItem","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747#listItem","name":"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066"},"previousItem":{"@type":"ListItem","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018#listItem","name":"Home"}},{"@type":"ListItem","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747#listItem","position":3,"name":"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066","previousItem":{"@type":"ListItem","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/category\/engineer#listItem","name":"\u6280\u8853\u8b1b\u7fd2"}}]},{"@type":"Organization","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/#organization","name":"OIS\u30d6\u30ed\u30b0","description":"OIS\u306e\u30d6\u30ed\u30b0\u7d39\u4ecb","url":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/","logo":{"@type":"ImageObject","url":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2025\/09\/OIS\u30ed\u30b4-\u6587\u5b57\u306a\u3057.png","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747\/#organizationLogo","width":128,"height":128},"image":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747\/#organizationLogo"},"sameAs":["https:\/\/www.facebook.com\/orientalinformationservice","https:\/\/x.com\/ois_yokohama","https:\/\/www.instagram.com\/ois_yokohama1978\/"]},{"@type":"Person","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/author\/akiyama#author","url":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/author\/akiyama","name":"akiyama","image":{"@type":"ImageObject","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747#authorImage","url":"https:\/\/secure.gravatar.com\/avatar\/ff5bd4b5c6242b44911d761454b7fa2ee660c3e49a42278fda2507916d9816d2?s=96&d=mm&r=g","width":96,"height":96,"caption":"akiyama"}},{"@type":"WebPage","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747#webpage","url":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747","name":"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066 | OIS\u30d6\u30ed\u30b0","inLanguage":"ja","isPartOf":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/#website"},"breadcrumb":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747#breadcrumblist"},"author":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/author\/akiyama#author"},"creator":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/author\/akiyama#author"},"image":{"@type":"ImageObject","url":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m.jpg","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747\/#mainImage","width":1920,"height":1280},"primaryImageOfPage":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747#mainImage"},"datePublished":"2023-04-05T15:38:23+09:00","dateModified":"2023-04-05T15:38:23+09:00"},{"@type":"WebSite","@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/#website","url":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/","name":"OIS\u30d6\u30ed\u30b0","description":"OIS\u306e\u30d6\u30ed\u30b0\u7d39\u4ecb","inLanguage":"ja","publisher":{"@id":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/#organization"}}]},"og:locale":"ja_JP","og:site_name":"OIS\u30d6\u30ed\u30b0 | OIS\u306e\u30d6\u30ed\u30b0\u7d39\u4ecb","og:type":"article","og:title":"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066 | OIS\u30d6\u30ed\u30b0","og:url":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747","og:image":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m.jpg","og:image:secure_url":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m.jpg","og:image:width":1920,"og:image:height":1280,"article:published_time":"2023-04-05T06:38:23+00:00","article:modified_time":"2023-04-05T06:38:23+00:00","article:publisher":"https:\/\/www.facebook.com\/orientalinformationservice","twitter:card":"summary","twitter:site":"@ois_yokohama","twitter:title":"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066 | OIS\u30d6\u30ed\u30b0","twitter:creator":"@ois_yokohama","twitter:image":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/wp-content\/uploads\/2023\/04\/26027758_m.jpg"},"aioseo_meta_data":{"post_id":"8747","title":null,"description":null,"keywords":[],"keyphrases":{"focus":{"keyphrase":"","score":0,"analysis":{"keyphraseInTitle":{"score":0,"maxScore":9,"error":1}}},"additional":[]},"primary_term":null,"canonical_url":null,"og_title":null,"og_description":null,"og_object_type":"default","og_image_type":"default","og_image_url":null,"og_image_width":null,"og_image_height":null,"og_image_custom_url":null,"og_image_custom_fields":null,"og_video":"","og_custom_url":null,"og_article_section":null,"og_article_tags":[],"twitter_use_og":false,"twitter_card":"default","twitter_image_type":"default","twitter_image_url":null,"twitter_image_custom_url":null,"twitter_image_custom_fields":null,"twitter_title":null,"twitter_description":null,"schema":{"blockGraphs":[],"customGraphs":[],"default":{"data":{"Article":[],"Course":[],"Dataset":[],"FAQPage":[],"Movie":[],"Person":[],"Product":[],"ProductReview":[],"Car":[],"Recipe":[],"Service":[],"SoftwareApplication":[],"WebPage":[]},"graphName":"","isEnabled":true},"graphs":[]},"schema_type":"default","schema_type_options":null,"pillar_content":false,"robots_default":true,"robots_noindex":false,"robots_noarchive":false,"robots_nosnippet":false,"robots_nofollow":false,"robots_noimageindex":false,"robots_noodp":false,"robots_notranslate":false,"robots_max_snippet":"-1","robots_max_videopreview":"-1","robots_max_imagepreview":"large","priority":null,"frequency":"default","local_seo":null,"breadcrumb_settings":null,"limit_modified_date":false,"ai":null,"created":"2023-04-05 06:22:34","updated":"2025-09-17 12:15:06","seo_analyzer_scan_date":null},"aioseo_breadcrumb":"<div class=\"aioseo-breadcrumbs\"><span class=\"aioseo-breadcrumb\">\n\t\t\t<a href=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\" title=\"Home\">Home<\/a>\n\t\t<\/span><span class=\"aioseo-breadcrumb-separator\">&raquo;<\/span><span class=\"aioseo-breadcrumb\">\n\t\t\t<a href=\"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/category\/engineer\" title=\"\u6280\u8853\u8b1b\u7fd2\">\u6280\u8853\u8b1b\u7fd2<\/a>\n\t\t<\/span><span class=\"aioseo-breadcrumb-separator\">&raquo;<\/span><span class=\"aioseo-breadcrumb\">\n\t\t\tgit\u306emerge\u3068rebase\u306b\u3064\u3044\u3066\n\t\t<\/span><\/div>","aioseo_breadcrumb_json":[{"label":"Home","link":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018"},{"label":"\u6280\u8853\u8b1b\u7fd2","link":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/category\/engineer"},{"label":"git\u306emerge\u3068rebase\u306b\u3064\u3044\u3066","link":"https:\/\/www.ois-yokohama.co.jp\/oisblog2018\/archives\/8747"}],"veu_head_title_object":{"title":"","add_site_title":""},"_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}]}}