{"id":8146,"date":"2025-10-04T18:30:42","date_gmt":"2025-10-04T18:30:42","guid":{"rendered":"https:\/\/pokecon.jp\/job\/?p=8146"},"modified":"2025-10-04T18:30:42","modified_gmt":"2025-10-04T18:30:42","slug":"github%e3%80%81%e3%83%9e%e3%83%bc%e3%82%b8%e3%82%b3%e3%83%b3%e3%83%95%e3%83%aa%e3%82%af%e3%83%88%e3%82%92%e3%83%af%e3%83%b3%e3%82%af%e3%83%aa%e3%83%83%e3%82%af%e3%81%a7%e8%a7%a3%e6%b1%ba%e5%8f%af","status":"publish","type":"post","link":"https:\/\/pokecon.jp\/job\/8146\/","title":{"rendered":"GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp"},"content":{"rendered":"\n<\/p>\n<div id=\"\">\n<p id=\"gh2YJkGchK\">GitHub\u306f2025\u5e7410\u67082\u65e5\u3001\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u969b\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u3068\u304d\u306bWeb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u4e0a\u3067\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u30dc\u30bf\u30f3\u306e\u63d0\u4f9b\u3092\u958b\u59cb\u3057\u305f\u3002<\/p>\n<p id=\"gh3z4yh6_R\">GitHub\u306e\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u753b\u9762\u306b\u304a\u3044\u3066\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u3066\u3044\u308b\u5834\u5408\u3001\u305d\u306e\u89e3\u6c7a\u306e\u305f\u3081\u306b<wbr>\u300cResolve conflicts\u300d<wbr>\u30dc\u30bf\u30f3\u3092\u62bc\u3059\u3068Web\u30a8\u30c7\u30a3\u30bf\u304c\u8d77\u52d5\u3057\u3066\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u7de8\u96c6\u753b\u9762\u306b\u9077\u79fb\u3059\u308b\u304c\u3001\u4eca\u56de\u3001\u30e2\u30c0\u30f3\u306a\u30a8\u30c7\u30a3\u30bf\u306a\u3069\u306b\u5b9f\u88c5\u3055\u308c\u3066\u3044\u308b\u3088\u3046\u306a\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u3068\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u3059\u308b\u305f\u3081\u306e\u6587\u5b57\u5217\u30dc\u30bf\u30f3\u304c\u63d0\u793a\u3055\u308c\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u3002<\/wbr><\/wbr><\/p>\n<figure class=\"f-img\" id=\"gh9JqEi_aB\">\n<img decoding=\"async\" src=\"https:\/\/gihyo.jp\/assets\/images\/article\/2025\/10\/github-one-click-merge-conflict-resolution\/conflict-1.png\" alt=\"\" width=\"938\" height=\"604\" loading=\"lazy\"\/><br \/>\n<\/figure>\n<p id=\"ghpO70ONTQ\">\u5404\u30dc\u30bf\u30f3\u306f\u4ee5\u4e0b\u306e\u3068\u304a\u308a\u3002<\/p>\n<ul id=\"gh3CwKhs7q\">\n<li id=\"ghekcz_iGK\">Accept current changes\uff1a\u73fe\u5728\u306e\u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u3092\u4fdd\u6301<\/li>\n<li id=\"ghbdj9_SxQ\">Accept incoming changes\uff1a\u30d9\u30fc\u30b9\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u3092\u63a1\u7528<\/li>\n<li id=\"ghPHNVBJZD\">Accept both changes\uff1a\u4e21\u65b9\u306e\u5909\u66f4\u3092\u30d5\u30a1\u30a4\u30eb\u4e0a\u3067\u7d71\u5408\u4f5c\u696d<\/li>\n<\/ul>\n<p id=\"gh3AwdTGu4\">Accept current changes\u307e\u305f\u306fAccept incoming changes\u3092\u62bc\u3059\u3068\u3001\u9078\u629e\u3057\u305f\u5909\u66f4\u304c\u53cd\u6620\u3055\u308c\u3001\u4ed6\u65b9\u306e\u5909\u66f4\u306f\u7834\u68c4\u3055\u308c\u308b\u3002Accept both changes\u3092\u62bc\u3059\u3068\u30012\u3064\u306e\u5909\u66f4\u304c\u305d\u306e\u307e\u307e\u7de8\u96c6\u753b\u9762\u306b\u6b8b\u308b\u306e\u3067\u3001\u624b\u52d5\u3067\u7de8\u96c6\u3059\u308b\u304b\u305f\u3061\u306b\u306a\u308b\u3002<\/p>\n<figure class=\"f-img\" id=\"gh6XUpRzap\"><figcaption>Accept both changes\u3092\u62bc\u3057\u305f\u5834\u5408\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308b<\/figcaption><img decoding=\"async\" src=\"https:\/\/gihyo.jp\/assets\/images\/article\/2025\/10\/github-one-click-merge-conflict-resolution\/conflict-2.png\" alt=\"\" width=\"938\" height=\"209\" loading=\"lazy\"\/><br \/>\n<\/figure>\n<p id=\"gh5pqwl497\">\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u5f8c\u306b<wbr>\u300cMarks Resolved\u300d<wbr>\u3092\u62bc\u3057\u3066\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u696d\u3092\u7d42\u3048\u3001\u3059\u3079\u3066\u306e\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u89e3\u6c7a\u3055\u308c\u305f\u3089<wbr>\u300cCommit merge\u300d<wbr>\u3067\u30b3\u30df\u30c3\u30c8\u3092\u304a\u3053\u306a\u3044\u3001\u81ea\u52d5\u7684\u306b\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u753b\u9762\u306b\u623b\u3063\u305f\u3042\u3068\u306b\u65e2\u5b58\u306e\u65b9\u6cd5\u3067\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u4f5c\u696d\u3059\u308b\u306e\u306f\u3053\u308c\u307e\u3067\u3069\u304a\u308a\u3002<\/wbr><\/wbr><\/wbr><\/wbr><\/p>\n<\/p><\/div>\n\n<br \/><a href=\"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution\">\u5143\u306e\u8a18\u4e8b\u3092\u78ba\u8a8d\u3059\u308b <\/a><\/p>\n","protected":false},"excerpt":{"rendered":"GitHub\u306f2025\u5e7410\u67082\u65e5\u3001\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u969b\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u3068\u304d\u306bWeb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u4e0a\u3067\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u30dc\u30bf\u30f3\u306e\u63d0\u4f9b\u3092\u958b\u59cb\u3057\u305f\u3002 GitHub\u306e\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u753b\u9762\u306b\u304a\u3044\u3066\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea [&hellip;]","protected":false},"author":1,"featured_media":8147,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[2],"tags":[],"class_list":["post-8146","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-hatena-blog"],"acf":[],"yoast_head":"<!-- This site is optimized with the Yoast SEO plugin v27.6 - https:\/\/yoast.com\/product\/yoast-seo-wordpress\/ -->\n<title>GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp - \u30dd\u30b1\u30b3\u30f3<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution\" \/>\n<meta property=\"og:locale\" content=\"ja_JP\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp - \u30dd\u30b1\u30b3\u30f3\" \/>\n<meta property=\"og:description\" content=\"GitHub\u306f2025\u5e7410\u67082\u65e5\u3001\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u969b\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u3068\u304d\u306bWeb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u4e0a\u3067\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u30dc\u30bf\u30f3\u306e\u63d0\u4f9b\u3092\u958b\u59cb\u3057\u305f\u3002 GitHub\u306e\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u753b\u9762\u306b\u304a\u3044\u3066\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution\" \/>\n<meta property=\"og:site_name\" content=\"\u30dd\u30b1\u30b3\u30f3\" \/>\n<meta property=\"article:published_time\" content=\"2025-10-04T18:30:42+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/pokecon.jp\/job\/wp-content\/uploads\/2025\/10\/conflict-1.png\" \/>\n\t<meta property=\"og:image:width\" content=\"938\" \/>\n\t<meta property=\"og:image:height\" content=\"604\" \/>\n\t<meta property=\"og:image:type\" content=\"image\/png\" \/>\n<meta name=\"author\" content=\"info@pokecon.jp\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u57f7\u7b46\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"info@pokecon.jp\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\\\/\\\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\\\/\\\/gihyo.jp\\\/article\\\/2025\\\/10\\\/github-one-click-merge-conflict-resolution#article\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/8146\\\/\"},\"author\":{\"name\":\"info@pokecon.jp\",\"@id\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/#\\\/schema\\\/person\\\/16c9f07b1ba984d165d9aee259bda997\"},\"headline\":\"GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp\",\"datePublished\":\"2025-10-04T18:30:42+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/8146\\\/\"},\"wordCount\":37,\"image\":{\"@id\":\"https:\\\/\\\/gihyo.jp\\\/article\\\/2025\\\/10\\\/github-one-click-merge-conflict-resolution#primaryimage\"},\"thumbnailUrl\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/wp-content\\\/uploads\\\/2025\\\/10\\\/conflict-1.png\",\"articleSection\":[\"\u306f\u3066\u306a\u30d6\u30ed\u30b0\"],\"inLanguage\":\"ja\"},{\"@type\":\"WebPage\",\"@id\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/8146\\\/\",\"url\":\"https:\\\/\\\/gihyo.jp\\\/article\\\/2025\\\/10\\\/github-one-click-merge-conflict-resolution\",\"name\":\"GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp - \u30dd\u30b1\u30b3\u30f3\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/#website\"},\"primaryImageOfPage\":{\"@id\":\"https:\\\/\\\/gihyo.jp\\\/article\\\/2025\\\/10\\\/github-one-click-merge-conflict-resolution#primaryimage\"},\"image\":{\"@id\":\"https:\\\/\\\/gihyo.jp\\\/article\\\/2025\\\/10\\\/github-one-click-merge-conflict-resolution#primaryimage\"},\"thumbnailUrl\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/wp-content\\\/uploads\\\/2025\\\/10\\\/conflict-1.png\",\"datePublished\":\"2025-10-04T18:30:42+00:00\",\"author\":{\"@id\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/#\\\/schema\\\/person\\\/16c9f07b1ba984d165d9aee259bda997\"},\"breadcrumb\":{\"@id\":\"https:\\\/\\\/gihyo.jp\\\/article\\\/2025\\\/10\\\/github-one-click-merge-conflict-resolution#breadcrumb\"},\"inLanguage\":\"ja\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\\\/\\\/gihyo.jp\\\/article\\\/2025\\\/10\\\/github-one-click-merge-conflict-resolution\"]}]},{\"@type\":\"ImageObject\",\"inLanguage\":\"ja\",\"@id\":\"https:\\\/\\\/gihyo.jp\\\/article\\\/2025\\\/10\\\/github-one-click-merge-conflict-resolution#primaryimage\",\"url\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/wp-content\\\/uploads\\\/2025\\\/10\\\/conflict-1.png\",\"contentUrl\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/wp-content\\\/uploads\\\/2025\\\/10\\\/conflict-1.png\",\"width\":938,\"height\":604},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\\\/\\\/gihyo.jp\\\/article\\\/2025\\\/10\\\/github-one-click-merge-conflict-resolution#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u30db\u30fc\u30e0\",\"item\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/#website\",\"url\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/\",\"name\":\"\u30dd\u30b1\u30b3\u30f3\",\"description\":\"\",\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/?s={search_term_string}\"},\"query-input\":{\"@type\":\"PropertyValueSpecification\",\"valueRequired\":true,\"valueName\":\"search_term_string\"}}],\"inLanguage\":\"ja\"},{\"@type\":\"Person\",\"@id\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/#\\\/schema\\\/person\\\/16c9f07b1ba984d165d9aee259bda997\",\"name\":\"info@pokecon.jp\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"ja\",\"@id\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/2b0549cd9f7907c092ca5fbb283baf72337f235726e4b46fa39ec0b701ac2fe2?s=96&d=wavatar&r=g\",\"url\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/2b0549cd9f7907c092ca5fbb283baf72337f235726e4b46fa39ec0b701ac2fe2?s=96&d=wavatar&r=g\",\"contentUrl\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/2b0549cd9f7907c092ca5fbb283baf72337f235726e4b46fa39ec0b701ac2fe2?s=96&d=wavatar&r=g\",\"caption\":\"info@pokecon.jp\"},\"url\":\"https:\\\/\\\/pokecon.jp\\\/job\\\/author\\\/infopokecon-jp\\\/\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp - \u30dd\u30b1\u30b3\u30f3","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution","og_locale":"ja_JP","og_type":"article","og_title":"GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp - \u30dd\u30b1\u30b3\u30f3","og_description":"GitHub\u306f2025\u5e7410\u67082\u65e5\u3001\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u969b\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u3068\u304d\u306bWeb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u4e0a\u3067\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u30dc\u30bf\u30f3\u306e\u63d0\u4f9b\u3092\u958b\u59cb\u3057\u305f\u3002 GitHub\u306e\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u753b\u9762\u306b\u304a\u3044\u3066\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea [&hellip;]","og_url":"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution","og_site_name":"\u30dd\u30b1\u30b3\u30f3","article_published_time":"2025-10-04T18:30:42+00:00","og_image":[{"width":938,"height":604,"url":"https:\/\/pokecon.jp\/job\/wp-content\/uploads\/2025\/10\/conflict-1.png","type":"image\/png"}],"author":"info@pokecon.jp","twitter_card":"summary_large_image","twitter_misc":{"\u57f7\u7b46\u8005":"info@pokecon.jp"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution#article","isPartOf":{"@id":"https:\/\/pokecon.jp\/job\/8146\/"},"author":{"name":"info@pokecon.jp","@id":"https:\/\/pokecon.jp\/job\/#\/schema\/person\/16c9f07b1ba984d165d9aee259bda997"},"headline":"GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp","datePublished":"2025-10-04T18:30:42+00:00","mainEntityOfPage":{"@id":"https:\/\/pokecon.jp\/job\/8146\/"},"wordCount":37,"image":{"@id":"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution#primaryimage"},"thumbnailUrl":"https:\/\/pokecon.jp\/job\/wp-content\/uploads\/2025\/10\/conflict-1.png","articleSection":["\u306f\u3066\u306a\u30d6\u30ed\u30b0"],"inLanguage":"ja"},{"@type":"WebPage","@id":"https:\/\/pokecon.jp\/job\/8146\/","url":"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution","name":"GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp - \u30dd\u30b1\u30b3\u30f3","isPartOf":{"@id":"https:\/\/pokecon.jp\/job\/#website"},"primaryImageOfPage":{"@id":"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution#primaryimage"},"image":{"@id":"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution#primaryimage"},"thumbnailUrl":"https:\/\/pokecon.jp\/job\/wp-content\/uploads\/2025\/10\/conflict-1.png","datePublished":"2025-10-04T18:30:42+00:00","author":{"@id":"https:\/\/pokecon.jp\/job\/#\/schema\/person\/16c9f07b1ba984d165d9aee259bda997"},"breadcrumb":{"@id":"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution#breadcrumb"},"inLanguage":"ja","potentialAction":[{"@type":"ReadAction","target":["https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution"]}]},{"@type":"ImageObject","inLanguage":"ja","@id":"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution#primaryimage","url":"https:\/\/pokecon.jp\/job\/wp-content\/uploads\/2025\/10\/conflict-1.png","contentUrl":"https:\/\/pokecon.jp\/job\/wp-content\/uploads\/2025\/10\/conflict-1.png","width":938,"height":604},{"@type":"BreadcrumbList","@id":"https:\/\/gihyo.jp\/article\/2025\/10\/github-one-click-merge-conflict-resolution#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u30db\u30fc\u30e0","item":"https:\/\/pokecon.jp\/job\/"},{"@type":"ListItem","position":2,"name":"GitHub\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30ef\u30f3\u30af\u30ea\u30c3\u30af\u3067\u89e3\u6c7a\u53ef\u80fd\u306a\u65b0\u3057\u3044UI\u3092\u63d0\u4f9b\u958b\u59cb | gihyo.jp"}]},{"@type":"WebSite","@id":"https:\/\/pokecon.jp\/job\/#website","url":"https:\/\/pokecon.jp\/job\/","name":"\u30dd\u30b1\u30b3\u30f3","description":"","potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/pokecon.jp\/job\/?s={search_term_string}"},"query-input":{"@type":"PropertyValueSpecification","valueRequired":true,"valueName":"search_term_string"}}],"inLanguage":"ja"},{"@type":"Person","@id":"https:\/\/pokecon.jp\/job\/#\/schema\/person\/16c9f07b1ba984d165d9aee259bda997","name":"info@pokecon.jp","image":{"@type":"ImageObject","inLanguage":"ja","@id":"https:\/\/secure.gravatar.com\/avatar\/2b0549cd9f7907c092ca5fbb283baf72337f235726e4b46fa39ec0b701ac2fe2?s=96&d=wavatar&r=g","url":"https:\/\/secure.gravatar.com\/avatar\/2b0549cd9f7907c092ca5fbb283baf72337f235726e4b46fa39ec0b701ac2fe2?s=96&d=wavatar&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/2b0549cd9f7907c092ca5fbb283baf72337f235726e4b46fa39ec0b701ac2fe2?s=96&d=wavatar&r=g","caption":"info@pokecon.jp"},"url":"https:\/\/pokecon.jp\/job\/author\/infopokecon-jp\/"}]}},"_links":{"self":[{"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/posts\/8146","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/comments?post=8146"}],"version-history":[{"count":1,"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/posts\/8146\/revisions"}],"predecessor-version":[{"id":8148,"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/posts\/8146\/revisions\/8148"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/media\/8147"}],"wp:attachment":[{"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/media?parent=8146"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/categories?post=8146"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/pokecon.jp\/job\/wp-json\/wp\/v2\/tags?post=8146"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}