{"id":47364,"date":"2023-12-12T19:29:14","date_gmt":"2023-12-12T10:29:14","guid":{"rendered":"https:\/\/kinsta.com\/jp\/?p=47364&#038;preview=true&#038;preview_id=47364"},"modified":"2023-12-15T18:45:13","modified_gmt":"2023-12-15T09:45:13","slug":"git-merge","status":"publish","type":"post","link":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/","title":{"rendered":"\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9"},"content":{"rendered":"<p>\u958b\u767a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4f5c\u696d\u3092\u9670\u3067\u652f\u3048\u308b\u306e\u304c<a href=\"https:\/\/git-scm.com\/\" target=\"_blank\" rel=\"noopener noreferrer\">Git<\/a>\u3067\u3059\u3002\u3057\u304b\u3057\u3001\u30c0\u30f3\u30b9\u30d5\u30ed\u30a2\u3067\u591a\u304f\u306e\u4eba\u304c\u8e0a\u308a\u306b\u8208\u3058\u308b\u306e\u3068\u540c\u3058\u3088\u3046\u306b\u3001\u8907\u6570\u4eba\u304c\u4ecb\u5165\u3059\u308b\u3068\u300c\u8db3\u306e\u8e0f\u307f\u5408\u3044\u300d\u306b\u306a\u308a\u304b\u306d\u307e\u305b\u3093\u3002\u4e8c\u4eba\u306e\u958b\u767a\u8005\u304c\u540c\u3058\u30b3\u30fc\u30c9\u3092\u7de8\u96c6\u3057\u3001\u305d\u308c\u3092\u30b3\u30df\u30c3\u30c8\u3057\u3066\u3057\u307e\u3046\u3053\u3068\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002\u3053\u306e\u3088\u3046\u306a\u5834\u5408\u306b\u306f\u3001Git\u306e\u30de\u30fc\u30b8\u3092\u99c6\u4f7f\u3057\u3066\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>Git\u306e\u30de\u30fc\u30b8\u305d\u306e\u3082\u306e\u306f\u30b7\u30f3\u30d7\u30eb\u3067\u3059\u304c\u3001\u9ad8\u5ea6\u306a\u30a2\u30d7\u30ed\u30fc\u30c1\u304c\u5fc5\u8981\u306b\u306a\u308b\u3053\u3068\u3082\u3042\u308a\u307e\u3059\u3002\u518d\u5e30\u7684\u30de\u30fc\u30b8\uff08recursive\uff09\u30843\u30a6\u30a7\u30a4\u30de\u30fc\u30b8\uff08three-way\uff09\u306a\u3069\u3092\u4f7f\u3046\u3053\u3068\u306b\u306a\u308b\u3067\u3057\u3087\u3046\u3002Git\u30de\u30fc\u30b8\u306e\u53d6\u308a\u6d88\u3057\u304c\u5fc5\u8981\u306b\u306a\u308b\u3053\u3068\u3082\u3042\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002<\/p>\n<p>\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u30c6\u30af\u30cb\u30c3\u30af\u306b\u3064\u3044\u3066\u3054\u8aac\u660e\u3057\u307e\u3059\u3002\u5b9f\u969b\u306b\u3001\u307e\u305a\u306f\u3069\u3093\u306a\u30e1\u30ea\u30c3\u30c8\u304c\u3042\u308b\u306e\u304b\u304b\u3089\u898b\u3066\u3044\u304d\u307e\u3057\u3087\u3046\u3002<br \/>\n<div><\/div><kinsta-auto-toc heading=\"Table of Contents\" exclude=\"last\" list-style=\"arrow\" selector=\"h2\" count-number=\"-1\"><\/kinsta-auto-toc><\/p>\n<h2>Git\u30de\u30fc\u30b8\u6226\u7565\u5165\u9580<\/h2>\n<p>\u30de\u30fc\u30b8\u306e\u57fa\u672c\u7684\u306a\u8003\u3048\u65b9\u306f\u5358\u7d14\u3067\u3059\u3002\u8907\u6570\u306e\u30b3\u30df\u30c3\u30c8\u3092\u3072\u3068\u3064\u306b\u307e\u3068\u3081\u3001\u3075\u305f\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u7d50\u5408\u3059\u308b\u3068\u3044\u3046\u3082\u306e\u3067\u3059\u3002\u3057\u304b\u3057\u3001\u6b63\u3057\u304f\u30b3\u30fc\u30c9\u3092\u30b3\u30df\u30c3\u30c8\u3057\u3066\u30de\u30fc\u30b8\u3059\u308b\u305f\u3081\u306b\u306f\u3001\u3055\u307e\u3056\u307e\u306a\u30c6\u30af\u30cb\u30c3\u30af\u304c\u5fc5\u8981\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u5927\u4e8b\u306a\u624b\u6cd5\u3092\u3044\u304f\u3064\u304b\u9806\u4e0d\u540c\u3067\u6271\u3044\u307e\u3059\u3002<a href=\"https:\/\/kinsta.com\/jp\/blog\/how-to-become-a-web-developer\/\" rel=\"noopener\">\u958b\u767a\u30ad\u30e3\u30ea\u30a2<\/a>\u306e\u4e2d\u3067\u3001\u3069\u308c\u3082\u5fc5\u8981\u306b\u306a\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u3055\u3089\u306b\u3001\u30dd\u30a4\u30f3\u30bf\u3084\u30d6\u30e9\u30f3\u30c1\u3001\u30b3\u30df\u30c3\u30c8\u3068\u3044\u3063\u305fGit\u306e\u57fa\u672c\u7684\u306a\u6982\u5ff5\u306b\u3064\u3044\u3066\u3082\u3057\u3063\u304b\u308a\u7406\u89e3\u3057\u3066\u304a\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n<h3>2\u30a6\u30a7\u30a4\u30de\u30fc\u30b8\u30683\u30a6\u30a7\u30a4\u30de\u30fc\u30b8\u306e\u9055\u3044<\/h3>\n<p>2\u30a6\u30a7\u30a4\u30de\u30fc\u30b8\u3068\u305d\u306e\u4ef2\u9593\u3067\u3042\u308b3\u30a6\u30a7\u30a4\u30de\u30fc\u30b8\u306e\u9055\u3044\u3092\u7406\u89e3\u3057\u3066\u304a\u304f\u3068\u4fbf\u5229\u3067\u3059\u3002\u6b21\u306b\u8aac\u660e\u3059\u308b\u30de\u30fc\u30b8\u6226\u7565\u306e\u307b\u3068\u3093\u3069\u306f\u3001\u4e09\u65b9\u5411\u306e\u72b6\u6cc1\u3092\u6271\u3044\u307e\u3059\u3002\u5b9f\u969b\u3001\u4e09\u65b9\u5411\u306e\u30de\u30fc\u30b8\u304c\u4f55\u3067\u3042\u308b\u304b\u306b\u3064\u3044\u3066\u8a71\u3059\u65b9\u304c\u3088\u308a\u308f\u304b\u308a\u3084\u3059\u3044\u3067\u3059\u3002\u6b21\u306e\u4f8b\u3092\u8003\u3048\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n<ul>\n<li>\u3044\u304f\u3064\u304b\u306e\u30b3\u30df\u30c3\u30c8\u304c\u3042\u308b<strong>main<\/strong>\u30d6\u30e9\u30f3\u30c1\u3068\u3001\u540c\u3058\u304f\u8907\u6570\u306e\u30b3\u30df\u30c3\u30c8\u304c\u3042\u308bfeature\u30d6\u30e9\u30f3\u30c1\u304c\u3042\u308b\u3068\u3057\u307e\u3059\u3002<\/li>\n<li>\u3057\u304b\u3057\u3001<strong>main<\/strong>\u30d6\u30e9\u30f3\u30c1\u304c\u3055\u3089\u306b\u30b3\u30df\u30c3\u30c8\u3092\u884c\u3046\u3068\u3001\u4e21\u65b9\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u5206\u5c90\u3057\u3066\u3057\u307e\u3044\u307e\u3059\u3002<\/li>\n<li>\u5e73\u305f\u304f\u8a00\u3048\u3070\u3001<strong>main<\/strong>\u30d6\u30e9\u30f3\u30c1\u3068feature\u30d6\u30e9\u30f3\u30c1\u306e\u4e21\u65b9\u306b\u56fa\u6709\u306e\u30b3\u30df\u30c3\u30c8\u304c\u3042\u308b\u3068\u3044\u3046\u3053\u3068\u3067\u3059\u3002\u3053\u308c\u3089\u30922\u30a6\u30a7\u30a4\u3067\u30de\u30fc\u30b8\u3059\u308b\u3068\u3001\u3044\u305a\u308c\u304b\u306e\u30b3\u30df\u30c3\u30c8\u3092\u5931\u3046\u3053\u3068\u306b\u306a\u308a\u307e\u3059\uff08\u304a\u305d\u3089\u304f<strong>main<\/strong>\u306e\u30b3\u30df\u30c3\u30c8\u3067\u3057\u3087\u3046\uff09\u3002<\/li>\n<li>\u305d\u306e\u4ee3\u308f\u308a\u3001Git\u3067\u306f\u73fe\u5728\u306e<strong>main<\/strong>\u30d6\u30e9\u30f3\u30c1\u3068feature\u30d6\u30e9\u30f3\u30c1\u306e\u4e21\u65b9\u304b\u3089\u65b0\u3057\u3044\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/li>\n<\/ul>\n<p>\u7c21\u5358\u306b\u8aac\u660e\u3059\u308b\u3068\u3001Git\u306f\u5909\u66f4\u3092\u30de\u30fc\u30b8\u3059\u308b\u305f\u3081\u306b\u4e09\u3064\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3092\u898b\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002<strong>main<\/strong>\u30d6\u30e9\u30f3\u30c1\u306e\u5148\u982d\u3001feature\u30d6\u30e9\u30f3\u30c1\u306e\u5148\u982d\u3001\u305d\u3057\u3066\u5171\u901a\u306e\u5148\u7956\u3067\u3059\u3002\u3053\u308c\u306f\u3001<strong>main<\/strong>\u30d6\u30e9\u30f3\u30c1\u3068feature\u30d6\u30e9\u30f3\u30c1\u306e\u4e21\u65b9\u306b\u5171\u901a\u3059\u308b\u6700\u7d42\u30b3\u30df\u30c3\u30c8\u3068\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u5b9f\u969b\u306b\u306f\u3001\u3042\u308b\u30de\u30fc\u30b8\u6226\u7565\u304c\u4e8c\u65b9\u5411\u304b\u4e09\u65b9\u5411\u304b\u3092\u6c17\u306b\u3059\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u591a\u304f\u306e\u5834\u5408\u3001\u305d\u306e\u6226\u7565\u306b\u95a2\u4fc2\u306a\u304f\u4f7f\u308f\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u305f\u3081\u3067\u3059\u3002\u3044\u305a\u308c\u306b\u305b\u3088\u3001<a href=\"https:\/\/docs.sevalla.com\/applications\/git\/github#import-a-repository-to-github\" rel=\"noopener\">\u30d6\u30e9\u30f3\u30c1\u3084\u30ea\u30dd\u30b8\u30c8\u30ea<\/a>\u306e\u30de\u30fc\u30b8\u306b\u95a2\u3057\u3066Git\u304c\u3069\u306e\u3088\u3046\u306b\u300c\u8003\u3048\u3066\u3044\u308b\u300d\u306e\u304b\u3092\u77e5\u3063\u3066\u304a\u304f\u306e\u306f\u6709\u76ca\u3067\u3057\u3087\u3046\u3002<\/p>\n<h3>fast-forward\u30de\u30fc\u30b8<\/h3>\n<p>\u6700\u521d\u306e\u6226\u7565\u306f\u3001\u4f55\u3082\u3057\u306a\u304f\u3066\u3082\u5b9f\u884c\u3067\u304d\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002fast-forward\u30de\u30fc\u30b8\u306f\u3001\uff08\u6df7\u4e71\u3092\u62db\u304f\u53ef\u80fd\u6027\u306e\u3042\u308b\uff09\u4f59\u8a08\u306a\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u306a\u304f<strong>main<\/strong>\u306e\u6700\u65b0\u30b3\u30df\u30c3\u30c8\u306b\u30dd\u30a4\u30f3\u30bf\u3092\u79fb\u52d5\u3055\u305b\u307e\u3059\u3002\u3053\u308c\u306f\u30af\u30ea\u30fc\u30f3\u306a\u30a2\u30d7\u30ed\u30fc\u30c1\u3067\u3001\u591a\u304f\u306e\u958b\u767a\u8005\u304c\u6a19\u6e96\u7684\u306b\u4f7f\u3046\u3082\u306e\u3067\u3059\u3002<\/p>\n<p>\u3053\u306e\u30c6\u30af\u30cb\u30c3\u30af\u306f\u3001\u30b3\u30df\u30c3\u30c8\u304c\u3042\u308b\u5834\u5408\u3082\u306a\u3044\u5834\u5408\u3082\u3001main\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u59cb\u3081\u307e\u3059\u3002\u4f8b\u3048\u3070\u3001\u65b0\u3057\u3044\u30d6\u30e9\u30f3\u30c1\u3092\u958b\u304d\u30b3\u30fc\u30c9\u3092\u4f5c\u6210\u3057\u3001\u30b3\u30df\u30c3\u30c8\u3092\u884c\u3044\u307e\u3059\u3002\u3053\u306e\u6642\u70b9\u3067\u3001\u5909\u66f4\u3092<strong>main<\/strong>\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002fast-forward\u30de\u30fc\u30b8\u306b\u306f\u3001\u305d\u308c\u3092\u5b9f\u884c\u3059\u308b\u305f\u3081\u306e\u6761\u4ef6\u304c\u3072\u3068\u3064\u3042\u308a\u307e\u3059\u3002<\/p>\n<ul>\n<li style=\"font-weight: 400\">\u65b0\u3057\u3044\u30d6\u30e9\u30f3\u30c1\u3067\u4f5c\u696d\u3057\u3066\u3044\u308b\u9593\u3001<strong>main<\/strong>\u3067\u306f\u4ed6\u306e\u30b3\u30df\u30c3\u30c8\u304c\u884c\u308f\u308c\u306a\u3044\u3088\u3046\u306b\u3059\u308b\u3053\u3068<\/li>\n<\/ul>\n<p>\u3068\u306f\u8a00\u3048\u3001\u3053\u308c\u306f\u5e38\u306b\u3067\u304d\u308b\u3053\u3068\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u5927\u6240\u5e2f\u306e\u30c1\u30fc\u30e0\u3067\u3042\u308c\u3070\u306a\u304a\u3055\u3089\u3067\u3059\u3002\u305d\u308c\u3067\u3082\u3001\u30b3\u30df\u30c3\u30c8\u3092\u6700\u65b0\u3067\u3042\u308a\u305d\u308c\u72ec\u81ea\u306e\u30b3\u30df\u30c3\u30c8\u306e\u306a\u3044main\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\u3068\u3001fast-forward\u30de\u30fc\u30b8\u304c\u5b9f\u884c\u3055\u308c\u307e\u3059\u3002 \u3053\u308c\u306b\u306f\u3001\u4ee5\u4e0b\u306b\u793a\u3059\u3088\u3046\u306b\u3044\u304f\u3064\u304b\u65b9\u6cd5\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git merge &lt;branch&gt;\n\ngit merge --ff-only\n<\/code><\/pre>\n<p>\u591a\u304f\u306e\u5834\u5408\u3001fast-forward\u30de\u30fc\u30b8\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u3053\u306e\u30bf\u30a4\u30d7\u306e\u30de\u30fc\u30b8\u306f\u3001<a href=\"https:\/\/kinsta.com\/blog\/git-for-web-development\/\" rel=\"noopener\">\u5358\u72ec\u30d7\u30ed\u30b8\u30a7\u30af\u30c8<\/a>\u3084\u5c0f\u898f\u6a21\u30c1\u30fc\u30e0\u3067\u5229\u7528\u3055\u308c\u307e\u3059\u3002\u5909\u66f4\u306e\u30da\u30fc\u30b9\u306e\u901f\u3044\u74b0\u5883\u3067\u306f\u7a00\u306a\u30de\u30fc\u30b8\u3060\u3068\u8a00\u3048\u308b\u3067\u3057\u3087\u3046\u3002\u4ed6\u306e\u30de\u30fc\u30b8\u3092\u5229\u7528\u3059\u308b\u307b\u3046\u304c\u4e00\u822c\u7684\u3067\u3059\u3002<\/p>\n<h3>\u518d\u5e30\u7684\u30de\u30fc\u30b8<\/h3>\n<p>\u518d\u5e30\u7684\u30de\u30fc\u30b8\u306f\u3001\u4ed6\u306e\u30bf\u30a4\u30d7\u306e\u30de\u30fc\u30b8\u3088\u308a\u3082\u4e00\u822c\u7684\u306a\u72b6\u6cc1\u3067\u767a\u751f\u3059\u308b\u305f\u3081\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u306a\u308b\u3053\u3068\u304c\u3088\u304f\u3042\u308a\u307e\u3059\u3002\u518d\u5e30\u7684\u30de\u30fc\u30b8\u3068\u306f\u3001\u3042\u308b\u30d6\u30e9\u30f3\u30c1\u3067\u30b3\u30df\u30c3\u30c8\u3092\u884c\u3044\u3001\u3055\u3089\u306b<strong>main<\/strong>\u30d6\u30e9\u30f3\u30c1\u3067\u3082\u30b3\u30df\u30c3\u30c8\u3092\u884c\u3046\u3053\u3068\u3067\u3059\u3002<\/p>\n<p>\u30de\u30fc\u30b8\u3059\u308b\u3068\u304d\u3001Git\u306f\u30d6\u30e9\u30f3\u30c1\u3092\u518d\u5e30\u3057\u3066\u6700\u7d42\u7684\u306a\u30b3\u30df\u30c3\u30c8\u3092\u884c\u3044\u307e\u3059\u3002\u3064\u307e\u308a\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u5b8c\u4e86\u3055\u305b\u308b\u3068\u3001\u305d\u306e\u30b3\u30df\u30c3\u30c8\u306b\u306f\u3075\u305f\u3064\u306e\u89aa\u304c\u5b58\u5728\u3059\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>fast-forward\u30de\u30fc\u30b8\u3068\u540c\u69d8\u3001\u901a\u5e38\u306f\u518d\u5e30\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u3057\u304b\u3057\u3001\u6b21\u306e\u30b3\u30de\u30f3\u30c9\u3068\u30d5\u30e9\u30b0\u3092\u4f7f\u3046\u3053\u3068\u3067\u3001fast-forward\u30de\u30fc\u30b8\u3092\u9078\u629e\u3057\u306a\u3044\u3088\u3046\u306b\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git merge --no-ff\n\ngit merge -s recursive &lt;branch1&gt; &lt;branch2&gt;\n<\/code><\/pre>\n<p>\u4e8c\u884c\u76ee\u3067\u306f\u3001<code>-s<\/code>\u30aa\u30d7\u30b7\u30e7\u30f3\u3068\u660e\u793a\u7684\u306a\u547d\u540d\u3092\u4f7f\u3063\u3066\u30de\u30fc\u30b8\u3092\u884c\u3063\u3066\u3044\u307e\u3059\u3002fast-forward\u30de\u30fc\u30b8\u3068\u306f\u7570\u306a\u308a\u3001\u518d\u5e30\u7684\u30de\u30fc\u30b8\u3067\u306f\u5c02\u7528\u306e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u4f5c\u6210\u3055\u308c\u307e\u3059\u30022\u30a6\u30a7\u30a4\u30de\u30fc\u30b8\u3067\u306f\u3001\u518d\u5e30\u7684\u6226\u7565\u306f\u5805\u5b9f\u3067\u3046\u307e\u304f\u6a5f\u80fd\u3057\u307e\u3059\u3002<\/p>\n<h3>ours\u3068theirs<\/h3>\n<p>\u958b\u767a\u4e2d\u306b\u3088\u304f\u3042\u308b\u72b6\u6cc1\u3068\u3057\u3066\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u3067\u65b0\u6a5f\u80fd\u3092\u4f5c\u6210\u3057\u305f\u3082\u306e\u306e\u6700\u7d42\u7684\u306b\u8a31\u53ef\u304c\u4e0b\u308a\u306a\u3044\u3068\u3044\u3046\u3082\u306e\u304c\u3042\u308a\u307e\u3059\u3002\u591a\u304f\u306e\u5834\u5408\u3001\u591a\u304f\u306e\u30b3\u30fc\u30c9\u3092\u30de\u30fc\u30b8\u3059\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u304c\u3001\u305d\u306e\u30b3\u30fc\u30c9\u3082\u307e\u305f\u5171\u4f9d\u5b58\u3067\u3059\u3002ours\u30de\u30fc\u30b8\u306f\u3001\u3053\u306e\u3088\u3046\u306a\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3059\u308b\u306e\u306b\u6709\u52b9\u3067\u3059\u3002<\/p>\n<p>\u3053\u306e\u30bf\u30a4\u30d7\u306e\u30de\u30fc\u30b8\u306f\u3001\u5fc5\u8981\u306a\u3060\u3051\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u6271\u3046\u3053\u3068\u304c\u3067\u304d\u3001\u4ed6\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u3092\u3059\u3079\u3066\u7121\u8996\u3057\u307e\u3059\u3002\u53e4\u3044\u6a5f\u80fd\u3084\u4e0d\u8981\u306a\u958b\u767a\u5185\u5bb9\u3092\u4e00\u6383\u3057\u305f\u3044\u5834\u5408\u306b\u4fbf\u5229\u3067\u3059\u3002\u5fc5\u8981\u306a\u30b3\u30de\u30f3\u30c9\u306f\u4ee5\u4e0b\u306e\u3068\u304a\u308a\u3067\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git merge -s ours &lt;branch1&gt; &lt;branch2&gt;<\/code><\/pre>\n<p>ours\u30de\u30fc\u30b8\u306f\u3001\u57fa\u672c\u7684\u306b\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u306b<em>\u305d\u306e<\/em>\u30b3\u30fc\u30c9\u304c\u542b\u307e\u308c\u308b\u3053\u3068\u3092\u610f\u5473\u3057\u307e\u3059\u3002\u3053\u308c\u3068\u306f\u5bfe\u7167\u7684\u306b\u3001\u4ed6\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u6b63\u3057\u3044\u3082\u306e\u3068\u3057\u3066\u6271\u3046theirs\u30de\u30fc\u30b8\u3082\u3042\u308a\u307e\u3059\u3002\u3053\u308c\u306b\u306f\u5225\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6e21\u3059\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git merge -X theirs &lt;branch2&gt;\n<\/code><\/pre>\n<p>ours\u30de\u30fc\u30b8\u3068theirs\u30de\u30fc\u30b8\u3092\u4f7f\u3044\u5206\u3051\u308b\u3068\u6df7\u4e71\u3059\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u304c\u3001\u4e00\u822c\u7684\u306b\u306f\u5178\u578b\u7684\u306a\u4f7f\u7528\u4f8b\uff08\u6700\u65b0\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u3059\u3079\u3066\u3092\u6b8b\u3057\u3001\u6b8b\u308a\u3092\u7834\u68c4\u3059\u308b\uff09\u306b\u3053\u3060\u308f\u308b\u306e\u304c\u5b89\u5168\u3067\u3059\u3002<\/p>\n<h3>octopus<\/h3>\n<p>\u8907\u6570\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u5225\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\u306e\u306f\u3001Git\u30de\u30fc\u30b8\u306b\u3068\u3063\u3066\u5384\u4ecb\u306a\u30b7\u30ca\u30ea\u30aa\u3067\u3059\u3002\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6c7a\u306b\u300c\u4e8c\u4eba\u4ee5\u4e0a\u306e\u624b\u300d\u304c\u5fc5\u8981\u3060\u3068\u611f\u3058\u305f\u3089\u3001octopus\u30de\u30fc\u30b8\u304c\u5229\u7528\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>octopus\u30de\u30fc\u30b8\u306f\u3001ours\u3084 theirs\u30de\u30fc\u30b8\u306e\u6b63\u53cd\u5bfe\u306e\u3088\u3046\u306a\u3082\u306e\u3067\u3059\u3002\u5178\u578b\u7684\u306a\u7528\u9014\u3068\u3057\u3066\u3001\u4f3c\u305f\u3088\u3046\u306a\u6a5f\u80fd\u306e\u8907\u6570\u306e\u30b3\u30df\u30c3\u30c8\u3092\u3072\u3068\u3064\u306b\u307e\u3068\u3081\u3066\u30de\u30fc\u30b8\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3069\u306e\u3088\u3046\u306b\u6e21\u3059\u304b\u306f\u6b21\u306e\u3068\u304a\u308a\u3067\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git merge -s octopus &lt;branch1&gt; &lt;branch2&gt;\n<\/code><\/pre>\n<p>\u3057\u304b\u3057\u3001\u305d\u306e\u5f8c\u306b\u624b\u52d5\u3067\u306e\u89e3\u6c7a\u304c\u5fc5\u8981\u306a\u5834\u5408\u306b\u306f\u3001octopus\u30de\u30fc\u30b8\u304c\u62d2\u5426\u3055\u308c\u307e\u3059\u3002\u81ea\u52d5\u89e3\u6c7a\u3067\u306f\u3001\u8907\u6570\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u3072\u3068\u3064\u306b\u30de\u30fc\u30b8\u3059\u308b\u969b\u306b\u30c7\u30d5\u30a9\u30eb\u30c8\u3067octopus\u30de\u30fc\u30b8\u304c\u884c\u308f\u308c\u307e\u3059\u3002<\/p>\n<h3>resolve<\/h3>\n<p>\u30b3\u30df\u30c3\u30c8\u3092\u30de\u30fc\u30b8\u3059\u308b\u3082\u3063\u3068\u3082\u5b89\u5168\u306a\u65b9\u6cd5\u306e\u3072\u3068\u3064\u3067\u3042\u308bresolve\u30de\u30fc\u30b8\u306f\u3001<a href=\"https:\/\/tonyg.github.io\/revctrl.org\/CrissCrossMerge.html\" target=\"_blank\" rel=\"noopener noreferrer\">\u8907\u6570\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u307e\u305f\u3044\u3067<\/a>\u30de\u30fc\u30b8\u3059\u308b\u306e\u306b\u4fbf\u5229\u3067\u3059\u3002\u307e\u305f\u3001\u3059\u3050\u306b\u5b9f\u884c\u3067\u304d\u308b\u89e3\u6c7a\u65b9\u6cd5\u3067\u3082\u3042\u308a\u307e\u3059\u3002\u3088\u308a\u8907\u96d1\u306a\u30de\u30fc\u30b8\u5c65\u6b74\u306e\u5834\u5408\u306b\u3082\uff08HEAD\u304c2\u3064\u3067\u3042\u308c\u3070\uff09\u3053\u306e\u65b9\u6cd5\u3092\u4f7f\u3046\u306e\u304c\u52b9\u679c\u7684\u3067\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git merge -s resolve &lt;branch1&gt; &lt;branch2&gt;\n<\/code><\/pre>\n<p>resolve\u30de\u30fc\u30b8\u306f\u3001\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u3068\u30d7\u30eb\u5143\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u4e21\u65b9\u3067\u52d5\u4f5c\u3059\u308b3\u65b9\u5411\u306e\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0\u3092\u4f7f\u7528\u3059\u308b\u305f\u3081\u3001\u4ed6\u306e\u30de\u30fc\u30b8\u65b9\u6cd5\u307b\u3069\u67d4\u8edf\u3067\u306f\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u3057\u304b\u3057\u3001\u5fc5\u8981\u306a\u4f5c\u696d\u3092\u884c\u3046\u3053\u3068\u306b\u95a2\u3057\u3066\u8a00\u3048\u3070\u3001resolve\u30de\u30fc\u30b8\u306f\u307b\u307c\u5b8c\u74a7\u306a\u9078\u629e\u80a2\u3067\u3059\u3002<\/p>\n<h3>subtree<\/h3>\n<p>\u3053\u308c\u306f\u518d\u5e30\u7684\u30de\u30fc\u30b8\u306e\u4ef2\u9593\u3067\u3001\u5c11\u3057\u308f\u304b\u308a\u306b\u304f\u3044\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002\u7c21\u5358\u4f8b\u3092\u4f7f\u3063\u3066\u8aac\u660e\u3057\u307e\u3059\u3002<\/p>\n<ul>\n<li>\u307e\u305a\u30012\u3064\u306e\u30c4\u30ea\u30fc\uff08X\u3068Y\uff09\u3092\u8003\u3048\u307e\u3059\u3002<\/li>\n<li>\u4e21\u65b9\u306e\u30c4\u30ea\u30fc\u30921\u3064\u306b\u30de\u30fc\u30b8\u3057\u305f\u3044\u3068\u3057\u307e\u3059\u3002<\/li>\n<li>\u30c4\u30ea\u30fcY\u304cX\u306e\u30b5\u30d6\u30c4\u30ea\u30fc\u306e1\u3064\u306b\u5bfe\u5fdc\u3059\u308b\u5834\u5408\u3001\u30c4\u30ea\u30fcY\u306fX\u306e\u69cb\u9020\u306b\u5408\u308f\u305b\u3066\u5909\u66f4\u3055\u308c\u307e\u3059\u3002<\/li>\n<\/ul>\n<p>\u3064\u307e\u308a\u3001subtree\u30de\u30fc\u30b8\u306f\u3001<a href=\"https:\/\/kinsta.com\/blog\/monorepo-vs-multi-repo\/\" rel=\"noopener\">\u8907\u6570\u306e\u30ea\u30dd\u30b8\u30c8\u30ea<\/a>\u30921\u3064\u306b\u307e\u3068\u3081\u305f\u3044\u5834\u5408\u306b\u6709\u7528\u3067\u3059\u3002\u307e\u305f\u3001\u4e21\u65b9\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5171\u901a\u306e\u300c\u7956\u5148\u300d\u30c4\u30ea\u30fc\u306b\u5fc5\u8981\u306a\u5909\u66f4\u3092\u52a0\u3048\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git merge -s subtree &lt;branch1&gt; &lt;branch2&gt;\n<\/code><\/pre>\n<p>\u8981\u3059\u308b\u306b\u3001subtree\u30de\u30fc\u30b8\u306f2\u3064\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u7d50\u5408\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u5834\u5408\u306b\u4f7f\u3048\u307e\u3059\u3002\u3068\u306f\u3044\u3048\u3001\u3069\u306e\u30de\u30fc\u30b8\u6226\u7565\u304c\u6b63\u3057\u3044\u306e\u304b\u7406\u89e3\u3059\u308b\u306e\u306b\u82e6\u52b4\u3059\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u5f8c\u3067\u3001\u5f79\u7acb\u3064\u30c4\u30fc\u30eb\u3092\u3044\u304f\u3064\u304b\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002<\/p>\n<p>\u305d\u306e\u524d\u306b\u3001\u9ad8\u5ea6\u306a\u30de\u30fc\u30b8\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3059\u308b\u65b9\u6cd5\u3092\u77e5\u3063\u3066\u304a\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n<h2>\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u5bfe\u51e6\u6cd5<\/h2>\n<p>Git\u3067\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u30de\u30fc\u30b8\u306f\u3001\u5b9f\u969b\u306b\u306f\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u7ba1\u7406\u3068\u305d\u306e\u89e3\u6c7a\u306b\u8cbb\u3084\u3055\u308c\u307e\u3059\u3002<a href=\"https:\/\/kinsta.com\/jp\/blog\/wordpress-agency\/\" rel=\"noopener\">\u30c1\u30fc\u30e0<\/a>\u3084\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u898f\u6a21\u304c\u5927\u304d\u304f\u306a\u308c\u3070\u306a\u308b\u307b\u3069\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3059\u308b\u53ef\u80fd\u6027\u306f\u9ad8\u304f\u306a\u308a\u307e\u3059\u3002\u4e2d\u306b\u306f\u8907\u96d1\u3067\u89e3\u6c7a\u304c\u96e3\u3057\u3044\u3082\u306e\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002<\/p>\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u6642\u9593\u3084\u304a\u91d1\u3001\u30ea\u30bd\u30fc\u30b9\u3092\u98df\u3044\u3064\u3076\u3057\u3066\u3057\u307e\u3046\u3053\u3068\u3092\u8003\u3048\u308b\u3068\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u82bd\u3092\u65e9\u304f\u6458\u3080\u65b9\u6cd5\u3092\u8003\u3048\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002\u305f\u3044\u3066\u3044\u306e\u5834\u5408\u30012\u4eba\u306e\u958b\u767a\u8005\u304c\u540c\u3058\u30b3\u30fc\u30c9\u306b\u53d6\u308a\u7d44\u307f\u30012\u4eba\u3068\u3082\u30b3\u30df\u30c3\u30c8\u3092\u6c7a\u5b9a\u3059\u308b\u3082\u306e\u3067\u3059\u3002<\/p>\n<p>\u305d\u306e\u305f\u3081\u3001\u4fdd\u7559\u4e2d\u306e\u5909\u66f4\u306e\u305f\u3081\u306b\u30de\u30fc\u30b8\u3092\u307e\u3063\u305f\u304f\u958b\u59cb\u3067\u304d\u306a\u304b\u3063\u305f\u308a\u3001\u30de\u30fc\u30b8\u4e2d\u306b\u624b\u52d5\u3067\u306e\u4ecb\u5165\u304c\u5fc5\u8981\u306a\u969c\u5bb3\u304c\u767a\u751f\u3057\u305f\u308a\u3059\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u30ef\u30fc\u30ad\u30f3\u30b0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u300c\u30af\u30ea\u30fc\u30f3\u300d\u306b\u306a\u3063\u305f\u3089\u3001\u4f5c\u696d\u3092\u958b\u59cb\u3057\u307e\u3057\u3087\u3046\u3002\u30de\u30fc\u30b8\u3092\u59cb\u3081\u308b\u3068\u3001\u591a\u304f\u306e\u5834\u5408Git\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u901a\u77e5\u3055\u308c\u307e\u3059\u3002<\/p>\n<figure id=\"attachment_155619\" aria-describedby=\"caption-attachment-155619\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155619 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/git-conflict.png\" alt=\"Git\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u793a\u3059\u30bf\u30fc\u30df\u30ca\u30eb\u30a6\u30a3\u30f3\u30c9\u30a6\" width=\"1000\" height=\"412\"><figcaption id=\"caption-attachment-155619\" class=\"wp-caption-text\">Git\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u793a\u3059\u30bf\u30fc\u30df\u30ca\u30eb\u30a6\u30a3\u30f3\u30c9\u30a6<\/figcaption><\/figure>\n<p>\u3088\u308a\u8a73\u3057\u3044\u60c5\u5831\u3092\u78ba\u8a8d\u3059\u308b\u306b\u306f\u3001<code>git status<\/code>\u3092\u5b9f\u884c\u3057\u3066\u8a73\u7d30\u3092\u898b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<figure id=\"attachment_155623\" aria-describedby=\"caption-attachment-155623\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155623 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/git-status.png\" alt=\"git status\u30b3\u30de\u30f3\u30c9\u306e\u7d50\u679c\u3092\u793a\u3059\u30bf\u30fc\u30df\u30ca\u30eb\u30a6\u30a3\u30f3\u30c9\u30a6\" width=\"1000\" height=\"342\"><figcaption id=\"caption-attachment-155623\" class=\"wp-caption-text\">git status\u30b3\u30de\u30f3\u30c9\u306e\u7d50\u679c\u3092\u793a\u3059\u30bf\u30fc\u30df\u30ca\u30eb\u30a6\u30a3\u30f3\u30c9\u30a6<\/figcaption><\/figure>\n<p>\u3053\u3053\u304b\u3089\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u539f\u56e0\u3068\u306a\u3063\u3066\u3044\u308b\u3055\u307e\u3056\u307e\u306a\u30d5\u30a1\u30a4\u30eb\u306b\u7740\u624b\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3053\u306e\u5f8c\u3067\u8aac\u660e\u3059\u308b\u30c4\u30fc\u30eb\u3084\u30c6\u30af\u30cb\u30c3\u30af\u3082\u5f79\u306b\u7acb\u3064\u306f\u305a\u3067\u3059\u3002<\/p>\n<h3>\u30de\u30fc\u30b8\u306e\u4e2d\u6b62\u3068\u30ea\u30bb\u30c3\u30c8<\/h3>\n<p>\u6642\u306b\u306f\u3001\u30de\u30fc\u30b8\u3092\u5b8c\u5168\u306b\u4e2d\u6b62\u3057\u3066\u307e\u3063\u3055\u3089\u306a\u72b6\u614b\u304b\u3089\u59cb\u3081\u308b\u5fc5\u8981\u304c\u3042\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u5b9f\u969b\u3001\u3053\u3053\u3067\u7d39\u4ecb\u3059\u308b\u30b3\u30de\u30f3\u30c9\u306f\u3069\u308c\u3082\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u3068\u304d\u306b\u3069\u3046\u3059\u308c\u3070\u3044\u3044\u306e\u304b\u307e\u3060\u308f\u304b\u3089\u306a\u3044\u3088\u3046\u306a\u72b6\u6cc1\u3067\u4f7f\u3046\u306e\u304c\u6709\u52b9\u3067\u3059\u3002<\/p>\n<p>\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3067\u3001\u9032\u884c\u4e2d\u306e\u30de\u30fc\u30b8\u3092\u4e2d\u6b62\u307e\u305f\u306f\u30ea\u30bb\u30c3\u30c8\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git merge --abort\n\ngit reset\n<\/code><\/pre>\n<p>\u3053\u306e2\u3064\u306e\u30b3\u30de\u30f3\u30c9\u306f\u4f3c\u3066\u3044\u307e\u3059\u304c\u3001\u4f7f\u7528\u3059\u308b\u72b6\u6cc1\u306f\u7570\u306a\u308a\u307e\u3059\u3002\u305f\u3068\u3048\u3070\u3001\u30de\u30fc\u30b8\u3092abort\u3067\u4e2d\u6b62\u3059\u308b\u3068\u30d6\u30e9\u30f3\u30c1\u306f\u30de\u30fc\u30b8\u524d\u306e\u72b6\u614b\u306b\u623b\u308a\u307e\u3059\u3002\u3057\u304b\u3057\u3001\u3053\u308c\u306f\u3046\u307e\u304f\u3044\u304b\u306a\u3044\u5834\u5408\u3082\u3042\u308a\u307e\u3059\u3002\u305f\u3068\u3048\u3070\u3001\u30ef\u30fc\u30ad\u30f3\u30b0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\/stash\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u5185\u5bb9\u304c\u3042\u308b\u3068\u3001abort\u306f\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002<\/p>\n<p>\u305d\u3057\u3066\u3001\u30de\u30fc\u30b8\u306e<a href=\"https:\/\/kinsta.com\/jp\/blog\/advanced-git\/#2-reverting-resetting-and-unstaging\">\u30ea\u30bb\u30c3\u30c8<\/a>\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u3092\u65e2\u77e5\u306e\u300c\u826f\u3044\u300d\u72b6\u614b\u306b\u623b\u3059\u3053\u3068\u3092\u610f\u5473\u3057\u307e\u3059\u3002\u5f8c\u8005\u306f\u3001Git\u3067\u30de\u30fc\u30b8\u958b\u59cb\u304c\u5931\u6557\u3057\u305f\u3068\u304d\u306b\u8003\u616e\u3059\u3079\u304d\u3067\u3059\u3002\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u30b3\u30df\u30c3\u30c8\u3057\u3066\u3044\u306a\u3044<a href=\"https:\/\/kinsta.com\/jp\/blog\/git-delete-local-branch\/\" rel=\"noopener\">\u5909\u66f4\u3082\u3059\u3079\u3066\u524a\u9664<\/a>\u3057\u3066\u3057\u307e\u3046\u306e\u3067\u3001\u6ce8\u610f\u304c\u5fc5\u8981\u3067\u3059\u3002<\/p>\n<h3>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8<\/h3>\n<p>\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u5927\u90e8\u5206\u306e\u78ba\u8a8d\u3068\u89e3\u6c7a\u306f\u7c21\u5358\u3067\u3059\u3002\u3057\u304b\u3057\u5834\u5408\u306b\u3088\u3063\u3066\u306f\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3059\u308b\u7406\u7531\u3068\u3001\u305d\u308c\u3092\u4fee\u6b63\u3059\u308b\u65b9\u6cd5\u3092\u77e5\u308b\u305f\u3081\u306b\u3001\u3088\u308a\u6df1\u304f\u6398\u308a\u4e0b\u3052\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<p><code>git merge<\/code>\u306e\u5f8c\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3092\u4f7f\u3063\u3066\u3001\u8a73\u3057\u3044\u60c5\u5831\u3092\u78ba\u8a8d\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git checkout --conflict=diff3 &lt;filename&gt;\n<\/code><\/pre>\n<p>\u3053\u308c\u306b\u3088\u308a\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u306e\u5178\u578b\u7684\u306a\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u3092\u4f7f\u7528\u3057\u3066\u3001\u30de\u30fc\u30b8\u306e\u7af6\u5408\u3092\u793a\u30592\u3064\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u6bd4\u8f03\u3092\u884c\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<figure id=\"attachment_155618\" aria-describedby=\"caption-attachment-155618\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155618 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/checkout-merge-conflict.png\" alt=\"\u7279\u5b9a\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30c1\u30a7\u30c3\u30af\" width=\"1000\" height=\"486\"><figcaption id=\"caption-attachment-155618\" class=\"wp-caption-text\">\u7279\u5b9a\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u30c1\u30a7\u30c3\u30af<\/figcaption><\/figure>\n<p>\u6280\u8853\u7684\u306b\u8a00\u3048\u3070\u3001\u3053\u308c\u306f\u30d5\u30a1\u30a4\u30eb\u3092\u518d\u5ea6\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u3092\u7f6e\u304d\u63db\u3048\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002\u3053\u306e\u64cd\u4f5c\u306f\u3001\u89e3\u6c7a\u3092\u901a\u3057\u3066\u4f55\u5ea6\u304b\u884c\u3046\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u3053\u3053\u3067\u3001<code>diff3 <\/code>\u5f15\u6570\u3092\u6e21\u3059\u3068\u3001\u57fa\u672c\u30d0\u30fc\u30b8\u30e7\u30f3\u3068\u4ee3\u66ff\u30d0\u30fc\u30b8\u30e7\u30f3\u3092ours\u3068theirs\u3067\u8868\u793a\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u5f15\u6570\u30aa\u30d7\u30b7\u30e7\u30f3\u306f<code>merge<\/code>\u3067\u3042\u308b\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u30b9\u30bf\u30a4\u30eb\u3092\u30c7\u30d5\u30a9\u30eb\u30c8\u304b\u3089\u5909\u66f4\u3057\u306a\u3044\u9650\u308a\u3001\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002<\/p>\n<h3>\u30cd\u30ac\u30c6\u30a3\u30d6\u30b9\u30da\u30fc\u30b9\u306e\u7121\u8996<\/h3>\n<p><a href=\"https:\/\/kinsta.com\/jp\/blog\/web-design-best-practices\/\" rel=\"noopener\">\u30cd\u30ac\u30c6\u30a3\u30d6\u30b9\u30da\u30fc\u30b9<\/a>\u3068\u305d\u306e\u4f7f\u3044\u65b9\u306f\u3088\u304f\u8b70\u8ad6\u3055\u308c\u308b\u3068\u3053\u308d\u3067\u3059\u3002<a href=\"https:\/\/kinsta.com\/blog\/best-programming-language-to-learn\/\" rel=\"noopener\">\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u8a00\u8a9e\u306b\u3088\u3063\u3066<\/a>\u7570\u306a\u308b\u7a2e\u985e\u306e\u30b9\u30da\u30fc\u30b9\u3092\u4f7f\u7528\u3057\u307e\u3059\u3057\u3001\u500b\u3005\u306e\u958b\u767a\u8005\u3067\u3082\u66f8\u5f0f\u304c\u7570\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u30b9\u30da\u30fc\u30b9\u5bfe\u30bf\u30d6\u306b\u3064\u3044\u3066\u610f\u898b\u3092\u8ff0\u3079\u308b\u3064\u3082\u308a\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u3057\u304b\u3057\u3001\u30d5\u30a1\u30a4\u30eb\u3084\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u306e\u3084\u308a\u65b9\u306b\u3088\u3063\u3066\u66f8\u5f0f\u304c\u3053\u308d\u3053\u308d\u5909\u308f\u308b\u3088\u3046\u306a\u72b6\u6cc1\u3067\u306f\u3001\u3053\u306eGit\u30de\u30fc\u30b8\u306e\u554f\u984c\u306b\u3076\u3064\u304b\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u898b\u3066\u307f\u308b\u3068\u3001\u524a\u9664\u3055\u308c\u305f\u884c\u3068\u8ffd\u52a0\u3055\u308c\u305f\u884c\u304c\u3042\u308b\u305f\u3081\u3001\u3053\u308c\u304c\u30de\u30fc\u30b8\u306e\u5931\u6557\u306e\u539f\u56e0\u3060\u3068\u308f\u304b\u308a\u307e\u3059\u3002<\/p>\n<figure id=\"attachment_155627\" aria-describedby=\"caption-attachment-155627\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155627 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/negative-space-conflict.png\" alt=\"\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u5dee\u5206\u3092\u30a8\u30c7\u30a3\u30bf\u3067\u8868\u793a\" width=\"1000\" height=\"692\"><figcaption id=\"caption-attachment-155627\" class=\"wp-caption-text\">\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u5dee\u5206\u3092\u30a8\u30c7\u30a3\u30bf\u3067\u8868\u793a<\/figcaption><\/figure>\n<p>\u3053\u306e\u3088\u3046\u306a\u554f\u984c\u304c\u8d77\u304d\u308b\u539f\u56e0\u3068\u3057\u3066\u3001Git\u3067\u306f\u8ca0\u306e\u30b9\u30da\u30fc\u30b9\u304c\u5909\u66f4\u70b9\u3068\u307f\u306a\u3055\u308c\u307e\u3059\u3002<\/p>\n<p>\u3057\u304b\u3057\u3001<code>git merge<\/code>\u30b3\u30de\u30f3\u30c9\u306b\u7279\u5b9a\u306e\u5f15\u6570\u3092\u8ffd\u52a0\u3059\u308b\u3053\u3068\u3067\u3001\u95a2\u9023\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u30cd\u30ac\u30c6\u30a3\u30d6\u30b9\u30da\u30fc\u30b9\u3092\u7121\u8996\u3059\u308b\u3088\u3046\u306b\u8a2d\u5b9a\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git merge -Xignore-all-space\n\ngit merge -Xignore-space-change\n<\/code><\/pre>\n<p>\u3053\u306e\u4e8c\u3064\u306e\u5f15\u6570\u306f\u4f3c\u3066\u3044\u307e\u3059\u304c\u3001\u4e2d\u8eab\u306b\u306f\u9055\u3044\u304c\u3042\u308a\u307e\u3059\u3002\u524d\u8005\u306f\u3059\u3079\u3066\u306e\u30b9\u30da\u30fc\u30b9\u3092\u7121\u8996\u3057\u307e\u3059\u3002\u5bfe\u7167\u7684\u306b\u3001<code>-Xignore-space-change<\/code>\u306f\u3001\u30b9\u30da\u30fc\u30b9\u306e\u9023\u7d9a\u3084\u884c\u672b\u306e\u5358\u4e00\u306e\u30b9\u30da\u30fc\u30b9\u3092\u7121\u8996\u3057\u307e\u3059\u3002<\/p>\n<p>\u3055\u3089\u306b\u5b89\u5168\u6027\u3092\u9ad8\u3081\u308b\u305f\u3081\u306b\u3001<code>--no-commit<\/code>\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3057\u3066\u3001\u6b63\u3057\u3044\u65b9\u6cd5\u3067\u30b9\u30da\u30fc\u30b9\u3092\u7121\u8996\u3067\u304d\u3066\u3044\u308b\u304b\u78ba\u8a8d\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002<\/p>\n<h3>\u30ed\u30b0\u306e\u30de\u30fc\u30b8<\/h3>\n<p>\u30c7\u30fc\u30bf\u3092\u3084\u308a\u3068\u308a\u3059\u308b\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u306e\u307b\u3068\u3093\u3069\u3059\u3079\u3066\u306b\u304a\u3044\u3066\u3001<a href=\"https:\/\/kinsta.com\/jp\/docs\/devkinsta\/devkinsta-troubleshooting\/logging\/\" rel=\"noopener\">\u30ed\u30b0\u306e\u8a18\u9332\u306f\u975e\u5e38\u306b\u91cd\u8981<\/a>\u3067\u3059\u3002Git\u3067\u306f\u3001\u30de\u30fc\u30b8\u306e\u885d\u7a81\u306e\u8a73\u7d30\u3092\u78ba\u8a8d\u3059\u308b\u305f\u3081\u306b\u30ed\u30b0\u3092\u4f7f\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3053\u306e\u60c5\u5831\u3092\u898b\u308b\u306b\u306f<code>git log<\/code>\u3092\u4f7f\u3044\u307e\u3059\u3002<\/p>\n<figure id=\"attachment_155621\" aria-describedby=\"caption-attachment-155621\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155621 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/git-log-file.png\" alt=\"\u30bf\u30fc\u30df\u30ca\u30eb\u3067\u306eGit\u30ed\u30b0\u306e\u5b9f\u884c\u3068\u8868\u793a\" width=\"1000\" height=\"537\"><figcaption id=\"caption-attachment-155621\" class=\"wp-caption-text\">\u30bf\u30fc\u30df\u30ca\u30eb\u3067\u306eGit\u30ed\u30b0\u306e\u5b9f\u884c\u3068\u8868\u793a<\/figcaption><\/figure>\n<p>\u57fa\u672c\u7684\u306b\u306f\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306e\u3059\u3079\u3066\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u30c0\u30f3\u30d7\u3057\u305f\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3067\u3059\u3002\u5f15\u6570\u3092\u8ffd\u52a0\u3057\u3066\u8868\u793a\u3092\u7d5e\u308a\u8fbc\u307f\u3001\u898b\u305f\u3044\u30b3\u30df\u30c3\u30c8\u3060\u3051\u3092\u8868\u793a\u3055\u305b\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git log --oneline --left-right &lt;branch1&gt;...&lt;branch2&gt;\n<\/code><\/pre>\n<p><a href=\"https:\/\/git-scm.com\/book\/en\/v2\/Git-Tools-Revision-Selection#_triple_dot\" target=\"_blank\" rel=\"noopener noreferrer\">\u30c8\u30ea\u30d7\u30eb\u30c9\u30c3\u30c8<\/a>\u3092\u4f7f\u7528\u3057\u3066\u3001\u30de\u30fc\u30b8\u6642\u306b2\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u542b\u307e\u308c\u305f\u30b3\u30df\u30c3\u30c8\u306e\u4e00\u89a7\u3092\u8868\u793a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u4e21\u65b9\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u5171\u6709\u3057\u3066\u3044\u308b\u30b3\u30df\u30c3\u30c8\u3092\u3059\u3079\u3066\u7d5e\u308a\u8fbc\u307f\u3001\u305d\u306e\u4e2d\u304b\u3089\u3055\u3089\u306b\u78ba\u8a8d\u3057\u305f\u3044\u30b3\u30df\u30c3\u30c8\u3092\u9078\u629e\u3057\u307e\u3059\u3002<\/p>\n<p>\u307e\u305f\u3001<code>git log --oneline --left-right --merge<\/code>\u3092\u4f7f\u7528\u3059\u308b\u3068\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u306b\u300c\u89e6\u308c\u305f\u300d\u30de\u30fc\u30b8\u5074\u306e\u30b3\u30df\u30c3\u30c8\u3060\u3051\u3092\u8868\u793a\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002<code>-p<\/code>\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4f7f\u7528\u3059\u308b\u3068\u3001\u7279\u5b9a\u306e\u300c\u5dee\u5206\u300d\u306b\u5bfe\u3059\u308b\u6b63\u78ba\u306a\u5909\u66f4\u70b9\u3092\u8868\u793a\u53ef\u80fd\u3067\u3059\u3002\u305f\u3060\u3057\u3001\u3053\u308c\u306f\u30de\u30fc\u30b8\u4ee5\u5916\u306e\u30b3\u30df\u30c3\u30c8\u306b\u5bfe\u3059\u308b\u3082\u306e\u3067\u3042\u308b\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u308c\u306b\u306f\u56de\u907f\u7b56\u304c\u3042\u308a\u3001\u6b21\u306b\u8aac\u660e\u3057\u307e\u3059\u3002<\/p>\n<h3>Git\u30de\u30fc\u30b8\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u8abf\u3079\u308b\u305f\u3081\u306e\u7d50\u5408Diff\u5f62\u5f0f\u306e\u4f7f\u7528<\/h3>\n<p><code>git log<\/code>\u306e\u8868\u793a\u3092\u3055\u3089\u306b\u767a\u5c55\u3055\u305b\u3066\u3001\u30de\u30fc\u30b8\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u8abf\u3079\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u5178\u578b\u7684\u306a\u72b6\u6cc1\u3067\u306f\u3001Git\u306f\u30b3\u30fc\u30c9\u3092\u30de\u30fc\u30b8\u3057\u3066\u6210\u529f\u3057\u305f\u3082\u306e\u3059\u3079\u3066\u3092\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u306b\u8ffd\u52a0\u3057\u307e\u3059\u3002\u3059\u308b\u3068\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u308b\u884c\u3060\u3051\u304c\u6b8b\u308a\u3001<code>git diff<\/code>\u30b3\u30de\u30f3\u30c9\u3067\u305d\u308c\u3092\u898b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<figure id=\"attachment_155620\" aria-describedby=\"caption-attachment-155620\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155620 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/git-diff.png\" alt=\"\u30bf\u30fc\u30df\u30ca\u30eb\u3067git diff\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\" width=\"1000\" height=\"714\"><figcaption id=\"caption-attachment-155620\" class=\"wp-caption-text\">\u30bf\u30fc\u30df\u30ca\u30eb\u3067git diff\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b<\/figcaption><\/figure>\n<p>\u3053\u306e\u300ccombined diff\u300d\u5f62\u5f0f\u3067\u306f\u3001\u4e8c\u5217\u306e\u60c5\u5831\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002\u6700\u521d\u306e\u5217\u306f\u3001\u3042\u306a\u305f\u81ea\u8eab\uff08ours\uff09\u306e\u30d6\u30e9\u30f3\u30c1\u3068\u30ef\u30fc\u30ad\u30f3\u30b0\u30b3\u30d4\u30fc\u306e\u9593\u3067\u884c\u304c\u7570\u306a\u3063\u3066\u3044\u308b\u304b\u3069\u3046\u304b\u3092\u793a\u3059\u3082\u306e\u3067\u30012\u756a\u76ee\u306e\u5217\u306ftheirs\u30d6\u30e9\u30f3\u30c1\u306b\u3064\u3044\u3066\u540c\u3058\u60c5\u5831\u3092\u793a\u3059\u3082\u306e\u3067\u3059\u3002<\/p>\n<p>\u30d7\u30e9\u30b9\u8a18\u53f7\u306f\u3001\u305d\u306e\u884c\u304c\u30ef\u30fc\u30ad\u30f3\u30b0\u30b3\u30d4\u30fc\u306b\u8ffd\u52a0\u3055\u308c\u305f\u3082\u306e\u306e\u3001\u7279\u5b9a\u306e\u30de\u30fc\u30b8\u5074\u306b\u306f\u8ffd\u52a0\u3055\u308c\u3066\u3044\u306a\u3044\u3053\u3068\u3092\u793a\u3057\u3001\u30de\u30a4\u30ca\u30b9\u8a18\u53f7\u306f\u3001\u305d\u306e\u884c\u304c\u524a\u9664\u3055\u308c\u305f\u3053\u3068\u3092\u793a\u3057\u307e\u3059\u3002<\/p>\n<p>Git\u306e\u30ed\u30b0\u3067\u3082\u3001\u3044\u304f\u3064\u304b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3048\u3070\u3053\u306ediff\u306e\u7d50\u5408\u5f62\u5f0f\u3092\u898b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git show\n\ngit log --cc -p\n<\/code><\/pre>\n<p>\u4e00\u3064\u306f\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306e\u5c65\u6b74\u3092\u898b\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002\u4e8c\u3064\u76ee\u306e\u30b3\u30de\u30f3\u30c9\u306f<code>-p<\/code>\u3092\u4f7f\u3063\u305f\u3082\u306e\u3067\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u4ee5\u5916\u306e\u30b3\u30df\u30c3\u30c8\u306b\u5bfe\u3059\u308b\u5909\u66f4\u70b9\u3092diff\u5f62\u5f0f\u3067\u8868\u793a\u3057\u307e\u3059\u3002<\/p>\n<h2>Git\u30de\u30fc\u30b8\u306e\u53d6\u308a\u6d88\u3057\u65b9<\/h2>\n<p>\u9593\u9055\u3044\u306f\u8d77\u3053\u308a\u3046\u308b\u3082\u306e\u3067\u3059\u3002\u30de\u30fc\u30b8\u3057\u305f\u5f8c\u3067\u3084\u308a\u76f4\u3057\u305f\u3044\u3068\u601d\u3046\u3053\u3068\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002\u5834\u5408\u306b\u3088\u3063\u3066\u306f\u3001<code>git commit --amend<\/code>\u3092\u4f7f\u3063\u3066\u76f4\u8fd1\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4fee\u6b63\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002\u30a8\u30c7\u30a3\u30bf\u304c\u958b\u304d\u3001\u76f4\u8fd1\u306e\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u4fee\u6b63\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u3088\u308a\u8907\u96d1\u306a\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3084\u305d\u306e\u7d50\u679c\u306e\u5909\u66f4\u3092\u53d6\u308a\u6d88\u3059\u3053\u3068\u306f\u53ef\u80fd\u3067\u306f\u3042\u308a\u307e\u3059\u304c\u3001\u30b3\u30df\u30c3\u30c8\u304c\u6c38\u7d9a\u7684\u306a\u3082\u306e\u3067\u3042\u308b\u3053\u3068\u304c\u591a\u3044\u306e\u3067\u3001\u96e3\u3057\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002<\/p>\n<p>\u305d\u306e\u305f\u3081\u3001\u591a\u304f\u306e\u624b\u9806\u3092\u8e0f\u3080\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<ul>\n<li>\u307e\u305a\u3001\u30b3\u30df\u30c3\u30c8\u3092\u898b\u76f4\u3057\u3066\u5fc5\u8981\u306a\u30de\u30fc\u30b8\u3078\u306e\u53c2\u7167\u3092\u898b\u3064\u3051\u308b<\/li>\n<li>\u6b21\u306b\u3001\u30d6\u30e9\u30f3\u30c1\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3066\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u3092\u78ba\u8a8d<\/li>\n<li>\u5fc5\u8981\u306a\u30d6\u30e9\u30f3\u30c1\u3068\u30b3\u30df\u30c3\u30c8\u306b\u3064\u3044\u3066\u306e\u60c5\u5831\u304c\u5f97\u3089\u308c\u305f\u3089\u3001\u76ee\u7684\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u306b\u5fdc\u3058\u3066\u7279\u5b9a\u306e<a href=\"https:\/\/kinsta.com\/jp\/blog\/advanced-git\/\">Git\u30b3\u30de\u30f3\u30c9<\/a>\u3092\u5b9f\u884c\u3059\u308b<\/li>\n<\/ul>\n<p>\u3053\u308c\u3089\u306e\u30b3\u30de\u30f3\u30c9\u3092\u8a73\u3057\u304f\u898b\u3066\u307f\u307e\u3057\u3087\u3046\u3002\u307e\u305f\u3001Git\u306e\u30de\u30fc\u30b8\u3092\u53d6\u308a\u6d88\u3059\u7c21\u5358\u306a\u65b9\u6cd5\u3001\u3055\u3089\u306b\u9ad8\u5ea6\u306a\u4f7f\u3044\u65b9\u3092\u3059\u308b\u305f\u3081\u306e\u30b3\u30de\u30f3\u30c9\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002<\/p>\n<h3>\u30b3\u30df\u30c3\u30c8\u306e\u30ec\u30d3\u30e5\u30fc<\/h3>\n<p><code>git log --oneline<\/code>\u30b3\u30de\u30f3\u30c9\u306f\u3001\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u95a2\u9023\u3059\u308b\u30ea\u30d3\u30b8\u30e7\u30f3ID\u3084\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u898b\u305f\u3044\u3068\u304d\u306b\u4fbf\u5229\u3067\u3059\u3002<\/p>\n<figure id=\"attachment_155622\" aria-describedby=\"caption-attachment-155622\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155622 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/git-log-oneline.png\" alt=\"\u30bf\u30fc\u30df\u30ca\u30eb\u3067git diff\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\uff08\u4e00\u884c\uff09\" width=\"1000\" height=\"356\"><figcaption id=\"caption-attachment-155622\" class=\"wp-caption-text\">\u30bf\u30fc\u30df\u30ca\u30eb\u3067git diff\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\uff08\u4e00\u884c\uff09<\/figcaption><\/figure>\n<p><code>git log --branches=*<\/code>\u30b3\u30de\u30f3\u30c9\u3082\u540c\u3058\u60c5\u5831\u3092\u8868\u793a\u3057\u307e\u3059\u304c\u3001\u3059\u3079\u3066\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u5bfe\u8c61\u3068\u306a\u308a\u307e\u3059\u3002\u305f\u3060\u3057\u3001<code>git checkout<\/code>\u3068\u4e00\u7dd2\u306b\u53c2\u7167ID\u3092\u4f7f\u7528\u3059\u308c\u3070\u3001\u300c\u5207\u308a\u96e2\u3055\u308c\u305f<code>HEAD<\/code>\u300d\uff08HEAD\u304c\u30b3\u30df\u30c3\u30c8ID\u3092\u76f4\u63a5\u6307\u3059\uff09\u72b6\u614b\u3092\u78ba\u7acb\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u306f\u3001\u6280\u8853\u7684\u306a\u89b3\u70b9\u304b\u3089\u3069\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u3082\u4f5c\u696d\u3057\u306a\u3044\u3053\u3068\u3092\u610f\u5473\u3057\u3001\u3044\u3063\u305f\u3093\u78ba\u7acb\u3055\u308c\u305f\u30d6\u30e9\u30f3\u30c1\u306b\u623b\u308b\u3068\u5909\u66f4\u3092\u300c\u653e\u68c4\u300d\u3059\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u305d\u306e\u305f\u3081\u3001\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3092\u307b\u3068\u3093\u3069\u30ea\u30b9\u30af\u306e\u306a\u3044\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u3068\u3057\u3066\u4f7f\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3057\u304b\u3057\u3001\u5909\u66f4\u3092\u4fdd\u6301\u3057\u305f\u3044\u5834\u5408\u306f\u3001<code>git checkout -b &lt;branch-name&gt;<\/code>\u3092\u4f7f\u3063\u3066\u30d6\u30e9\u30f3\u30c1\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3001<a href=\"https:\/\/kinsta.com\/jp\/blog\/git-rename-branch\/\" target=\"_blank\" rel=\"noopener noreferrer\">\u65b0\u3057\u3044\u540d\u524d\u3092\u3064\u3051\u308b<\/a>\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u306fGit\u306e\u30de\u30fc\u30b8\u3092\u53d6\u308a\u6d88\u3059\u5805\u5b9f\u306a\u65b9\u6cd5\u3067\u3059\u304c\u3001\u8907\u96d1\u306a\u72b6\u6cc1\u3067\u306f\u4ed6\u306e\u624b\u6cd5\u3082\u4f7f\u3048\u307e\u3059\u3002<\/p>\n<h3>git reset\u306e\u4f7f\u7528<\/h3>\n<p>\u30de\u30fc\u30b8\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u591a\u304f\u306f\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u767a\u751f\u3059\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u305d\u306e\u3088\u3046\u306a\u5834\u5408\u306f\u3001<code>git reset<\/code>\u304c\u4f7f\u3048\u307e\u3059\u3002\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306b\u306f\u3055\u3089\u306b\u591a\u304f\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u3084\u5f15\u6570\u304c\u3042\u308a\u307e\u3059\u3002\u5b9f\u969b\u306e\u30b3\u30de\u30f3\u30c9\u306e\u4f7f\u3044\u65b9\u306f\u4ee5\u4e0b\u306e\u3068\u304a\u308a\u3067\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git reset --hard &lt;reference&gt;\n<\/code><\/pre>\n<p>\u3053\u306e\u6700\u521d\u306e\u90e8\u5206\uff08<code>git reset --hard<\/code>\uff09\u306b3\u3064\u306e\u30b9\u30c6\u30c3\u30d7\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<ul>\n<li style=\"font-weight: 400\">\u53c2\u7167\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u524d\u306e\u4f4d\u7f6e\u306b\u79fb\u52d5\u3059\u308b<\/li>\n<li style=\"font-weight: 400\">\u30cf\u30fc\u30c9\u30ea\u30bb\u30c3\u30c8\u306b\u3088\u308a\u3001\u300c\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u300d\uff08\u3064\u307e\u308a\u3001\u6b21\u306b\u63d0\u6848\u3055\u308c\u308b\u30b3\u30df\u30c3\u30c8\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\uff09\u3092\u53c2\u7167\u30d6\u30e9\u30f3\u30c1\u306e\u3088\u3046\u306b\u3059\u308b<\/li>\n<li style=\"font-weight: 400\">\u30ef\u30fc\u30ad\u30f3\u30b0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u3088\u3046\u306b\u3059\u308b<\/li>\n<\/ul>\n<p>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u304b\u3089\u305d\u308c\u4ee5\u964d\u306e\u30b3\u30df\u30c3\u30c8\u304c\u524a\u9664\u3055\u308c\u3001\u53c2\u7167\u3055\u308c\u305fID\u306b\u30ea\u30bb\u30c3\u30c8\u3055\u308c\u307e\u3059\u3002Git\u306e\u30de\u30fc\u30b8\u3092\u53d6\u308a\u6d88\u3059\u3059\u3063\u304d\u308a\u3068\u3057\u305f\u65b9\u6cd5\u3067\u3059\u304c\u3001\u3059\u3079\u3066\u306e\u72b6\u6cc1\u3067\u6709\u52b9\u3068\u306f\u8a00\u3048\u307e\u305b\u3093\u3002<\/p>\n<p>\u305f\u3068\u3048\u3070\u3001\u30ed\u30fc\u30ab\u30eb\u306e\u30ea\u30bb\u30c3\u30c8\u30b3\u30df\u30c3\u30c8\u3092\u305d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u542b\u3080<a href=\"https:\/\/kinsta.com\/blog\/gitlab-vs-github\/\" rel=\"noopener\">\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea<\/a>\u306b\u30d7\u30c3\u30b7\u30e5\u3057\u3088\u3046\u3068\u3059\u308b\u3068\u30a8\u30e9\u30fc\u306b\u306a\u308a\u307e\u3059\u3002\u305d\u306e\u3088\u3046\u306a\u5834\u5408\u306b\u306f\u3001\u5225\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3044\u307e\u3057\u3087\u3046\u3002<\/p>\n<h3>git revert\u306e\u4f7f\u7528<\/h3>\n<p><code>git reset<\/code>\u3068<code>git revert<\/code>\u306f\u3069\u3061\u3089\u3082\u4f3c\u3066\u3044\u308b\u3088\u3046\u306b\u898b\u3048\u307e\u3059\u304c\u3001\u3044\u304f\u3064\u304b\u91cd\u8981\u306a\u9055\u3044\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u308c\u307e\u3067\u306e\u4f8b\u3067\u306f\u3001\u5143\u306b\u623b\u3059\u51e6\u7406\u3067\u306f\u53c2\u7167\u30dd\u30a4\u30f3\u30bf\u3068HEAD\u3092\u7279\u5b9a\u306e\u30b3\u30df\u30c3\u30c8\u306b\u79fb\u52d5\u3055\u305b\u3066\u3044\u307e\u3057\u305f\u3002\u3053\u308c\u306f\u3001\u30c8\u30e9\u30f3\u30d7\u3092\u30b7\u30e3\u30c3\u30d5\u30eb\u3057\u3066\u65b0\u3057\u3044\u9806\u756a\u3092\u4f5c\u308b\u3088\u3046\u306a\u3082\u306e\u3067\u3059\u3002<\/p>\n<p>\u5bfe\u7167\u7684\u306b\u3001<code>git revert<\/code>\u3067\u306f\u3001\u30d0\u30c3\u30af\u30c8\u30e9\u30c3\u30af\u306e\u5909\u66f4\u306b\u57fa\u3065\u3044\u3066\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u3001\u53c2\u7167\u30dd\u30a4\u30f3\u30bf\u3092\u66f4\u65b0\u3057\u3066\u30d6\u30e9\u30f3\u30c1\u3092\u65b0\u305f\u306a\u300c\u6700\u65b0\u300d\u306b\u3057\u307e\u3059\u3002\u3053\u306e\u3088\u3046\u306a\u6027\u8cea\u304b\u3089\u3001\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3046\u306e\u304c\u4fbf\u5229\u3067\u3059\u3002<\/p>\n<p><code>git revert &lt;reference&gt;<\/code>\u3092\u4f7f\u3063\u3066Git\u306e\u30de\u30fc\u30b8\u3092\u53d6\u308a\u6d88\u3059\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002\u30b3\u30df\u30c3\u30c8\u53c2\u7167\u3092\u6307\u5b9a\u3057\u306a\u3044\u3068\u30b3\u30de\u30f3\u30c9\u304c\u5b9f\u884c\u3055\u308c\u307e\u305b\u3093\u306e\u3067\u3054\u6ce8\u610f\u304f\u3060\u3055\u3044\u3002\u30b3\u30de\u30f3\u30c9\u306b<code>HEAD<\/code>\u3092\u6e21\u3059\u3068\u3001\u6700\u65b0\u306e\u30b3\u30df\u30c3\u30c8\u306b\u623b\u3059\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>\u3055\u3089\u306b\u3001\u5b9f\u884c\u5185\u5bb9\u3092\u3088\u308a\u660e\u78ba\u306b\u6307\u5b9a\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git revert -m 1 &lt;reference&gt;\n<\/code><\/pre>\n<p>\u30de\u30fc\u30b8\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u306f2\u3064\u306e\u300c\u89aa\u300d\u3092\u6301\u3064\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u30021\u3064\u306f\u6307\u5b9a\u3057\u305f\u53c2\u7167\u306b\u95a2\u3059\u308b\u3082\u306e\u3067\u3001\u3082\u30461\u3064\u306f\u30de\u30fc\u30b8\u3057\u305f\u3044\u30d6\u30e9\u30f3\u30c1\u306e\u6700\u65b0\u306e\u30b3\u30df\u30c3\u30c8\u3067\u3059\u3002\u3053\u306e\u5834\u5408\u3001<code>-m 1<\/code>\u306f\u6700\u521d\u306e\u89aa\u3001\u3064\u307e\u308a\u6307\u5b9a\u3057\u305f\u53c2\u7167\u3092\u300c\u30e1\u30a4\u30f3\u30e9\u30a4\u30f3\u300d\u3068\u3057\u3066\u4fdd\u6301\u3059\u308b\u3088\u3046\u6307\u793a\u3059\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p><code>git revert<\/code>\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u306f<code>-e<\/code>\u3042\u308b\u3044\u306f<code>--edit<\/code>\u3067\u3059\u3002\u3053\u308c\u306b\u3088\u308a\u3001\u30a8\u30c7\u30a3\u30bf\u3092\u958b\u304d\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u7de8\u96c6\u3067\u304d\u307e\u3059\u3002<code>--no-edit<\/code>\u3092\u6e21\u3059\u3068\u30a8\u30c7\u30a3\u30bf\u306f\u958b\u304d\u307e\u305b\u3093\u3002<\/p>\n<p><code>-n<\/code>\u307e\u305f\u306f<code>--no-commit<\/code>\u3092\u6e21\u3059\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002\u3059\u308b\u3068\u3001<code>git revert<\/code>\u306b\u3088\u308a\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u306f\u4f5c\u6210\u3055\u308c\u305a\u3001\u5909\u66f4\u3092\u300c\u53cd\u8ee2\u300d\u3059\u308b\u3053\u3068\u3067\u3001\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3068\u30ef\u30fc\u30ad\u30f3\u30b0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002<\/p>\n<h2>Git\u306b\u304a\u3051\u308b\u30de\u30fc\u30b8\u3068rebase\u306e\u9055\u3044<\/h2>\n<p><code>git merge<\/code>\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3046\u4ee3\u308f\u308a\u306b\u3001<code>git rebase<\/code>\u3092\u4f7f\u3046\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u3082\u5909\u66f4\u30921\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u7d71\u5408\u3059\u308b\u65b9\u6cd5\u3067\u3059\u304c\u3001\u4ee5\u4e0b\u306e\u9055\u3044\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<ul>\n<li><code>git merge<\/code>\u3092\u4f7f\u3063\u305f\u5834\u5408\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u306f3\u30a6\u30a7\u30a4\u30de\u30fc\u30b8\u3067\u3059\u3002\u6700\u65b0\u306e2\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3092\u7d50\u5408\u3057\u3001\u4e21\u65b9\u306e\u5171\u901a\u306e\u5148\u7956\u3068\u30de\u30fc\u30b8\u3057\u3066\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002<\/li>\n<li>rebase\u306f\u3001\u5206\u5c90\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u30d1\u30c3\u30c1\u3092\u9069\u7528\u3057\u305f\u5909\u66f4\u3092\u5225\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u9069\u7528\u3059\u308b\u3082\u306e\u3067\u3001\u5148\u7956\u306f\u5fc5\u8981\u3042\u308a\u307e\u305b\u3093\u3002\u3064\u307e\u308a\u3001\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u306f\u767a\u751f\u3057\u307e\u305b\u3093\u3002<\/li>\n<\/ul>\n<p>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3046\u306b\u306f\u3001rebase\u3057\u305f\u3044\u30d6\u30e9\u30f3\u30c1\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u307e\u3059\u3002\u305d\u3053\u304b\u3089\u6b21\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3044\u307e\u3059\u3002<\/p>\n<pre><code class=\"language-bash\">git rebase -i &lt;reference&gt;\n<\/code><\/pre>\n<p>\u591a\u304f\u306e\u5834\u5408\u3001\u53c2\u7167\u306f\u30e1\u30a4\u30f3\u30d6\u30e9\u30f3\u30c1\u306b\u306a\u308a\u307e\u3059\u3002<code>-i<\/code>\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u300c\u5bfe\u8a71\u7684rebase\u300d\u304c\u5b9f\u884c\u3055\u308c\u307e\u3059\u3002\u3053\u308c\u306b\u3088\u3063\u3066\u3001\u30b3\u30df\u30c3\u30c8\u79fb\u52d5\u306b\u969b\u3057\u3066\u305d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u5909\u66f4\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<code>git rebase<\/code>\u3092\u4f7f\u3046\u5927\u304d\u306a\u30e1\u30ea\u30c3\u30c8\u306e\u3072\u3068\u3064\u3067\u3059\u3002<\/p>\n<p>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001\u79fb\u52d5\u3059\u308b\u30b3\u30df\u30c3\u30c8\u306e\u5019\u88dc\u304c\u30a8\u30c7\u30a3\u30bf\u306b\u8868\u793a\u3055\u308c\u307e\u3059\u3002\u3053\u308c\u306b\u3088\u308a\u3001\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u306e\u898b\u305f\u76ee\u3092\u81ea\u7531\u306b\u5909\u66f4\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<code>pick<\/code>\u30b3\u30de\u30f3\u30c9\u3092<code>fixup<\/code>\u306b\u5909\u66f4\u3059\u308c\u3070\u3001\u30b3\u30df\u30c3\u30c8\u3092\u30de\u30fc\u30b8\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002\u5909\u66f4\u3092\u4fdd\u5b58\u3059\u308b\u3068\u3001Git\u306b\u3088\u308arebase\u304c\u5b9f\u884c\u3055\u308c\u307e\u3059\u3002<\/p>\n<p>\u5168\u4f53\u3068\u3057\u3066\u3001Git\u306e\u30de\u30fc\u30b8\u306e\u65b9\u304c\u591a\u304f\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u4f7f\u308f\u308c\u307e\u3059\u3002\u3057\u304b\u3057\u3001rebase\u306b\u3082\u591a\u304f\u306e\u5229\u70b9\u304c\u3042\u308a\u307e\u3059\u3002\u305f\u3068\u3048\u3070\u3001\u30de\u30fc\u30b8\u306f\u30b7\u30f3\u30d7\u30eb\u306a\u64cd\u4f5c\u3067\u30de\u30fc\u30b8\u5c65\u6b74\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3092\u4fdd\u6301\u3067\u304d\u307e\u3059\u304c\u3001\u30ea\u30d9\u30fc\u30b9\u306f\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u3092\u3072\u3068\u3064\u306b\u307e\u3068\u3081\u3089\u308c\u308b\u306e\u3067\u3059\u3063\u304d\u308a\u3057\u307e\u3059\u3002<\/p>\n<p>\u3068\u306f\u3044\u3048\u3001\u30ea\u30d9\u30fc\u30b9\u306f\u30a8\u30e9\u30fc\u306e\u53ef\u80fd\u6027\u304c\u5927\u304d\u3044\u306e\u3067\u3001\u3088\u308a\u6ce8\u610f\u304c\u5fc5\u8981\u3067\u3059\u3002\u3055\u3089\u306b\u3001\u30ea\u30d9\u30fc\u30b9\u306f\u81ea\u5206\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u3057\u304b\u5f71\u97ff\u3092\u4e0e\u3048\u306a\u3044\u306e\u3067\u3001\u30d1\u30d6\u30ea\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3067\u306f\u3053\u306e\u30c6\u30af\u30cb\u30c3\u30af\u3092\u4f7f\u3046\u3079\u304d\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u7d50\u679c\u3068\u3057\u3066\u767a\u751f\u3057\u305f\u554f\u984c\u3092\u4fee\u6b63\u3059\u308b\u306b\u306f\u3055\u3089\u306b\u591a\u304f\u306e\u30de\u30fc\u30b8\u304c\u5fc5\u8981\u306b\u306a\u308a\u3001\u8907\u6570\u306e\u30b3\u30df\u30c3\u30c8\u304c\u767a\u751f\u3059\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<h2>Git\u30de\u30fc\u30b8\u306e\u7ba1\u7406\u3092\u52a9\u3051\u308b\u30c4\u30fc\u30eb<\/h2>\n<p>Git\u306e\u30de\u30fc\u30b8\u306b\u307e\u3064\u308f\u308b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u8907\u96d1\u3055\u3092\u8003\u3048\u308b\u3068\u3001\u624b\u52a9\u3051\u304c\u6b32\u3057\u304f\u306a\u308b\u3053\u3068\u3067\u3057\u3087\u3046\u3002<a href=\"https:\/\/kinsta.com\/blog\/php-editor\/\" rel=\"noopener\">Intellij IDEA<\/a>\u306b\u306f\u3001<strong>Branches<\/strong>\u30e1\u30cb\u30e5\u30fc\u3092\u4f7f\u3063\u305f\u624b\u6cd5\u304c\u7d44\u307f\u8fbc\u307e\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n<figure id=\"attachment_155624\" aria-describedby=\"caption-attachment-155624\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155624 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/intellij-branches.png\" alt=\"Intellij IDEA\u3067\u30d6\u30e9\u30f3\u30c1\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\" width=\"1000\" height=\"378\"><figcaption id=\"caption-attachment-155624\" class=\"wp-caption-text\">Intellij IDEA\u3067\u30d6\u30e9\u30f3\u30c1\u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8<\/figcaption><\/figure>\n<p><a href=\"https:\/\/code.visualstudio.com\/#built-in-git\" target=\"_blank\" rel=\"noopener noreferrer\">VSCode<\/a>\u306e\u30e6\u30fc\u30b6\u30fc\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\uff08UI\uff09\u306b\u3082\u3001\u540c\u69d8\u306e\u6a5f\u80fd\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002\u53e4\u304f\u304b\u3089\u306eAtom\u30e6\u30fc\u30b6\u30fc\u306a\u3089\u3001Microsoft\u304c\u898b\u4e8b\u306b<a href=\"https:\/\/kinsta.com\/jp\/blog\/git-vs-github\/\" target=\"_blank\" rel=\"noopener noreferrer\">Git\u7d71\u5408<\/a>\u3092\u884c\u3063\u305f\u3053\u3068\u304c\u308f\u304b\u308b\u306f\u305a\u3067\u3059\uff08\u62e1\u5f35\u6a5f\u80fd\u3084\u30a2\u30c9\u30aa\u30f3\u3092\u8ffd\u52a0\u3059\u308b\u3053\u3068\u306a\u304f<a href=\"https:\/\/kinsta.com\/jp\/blog\/what-is-github\/\">GitHub\u306b\u63a5\u7d9a<\/a>\u3059\u308b\u3053\u3068\u304c\u53ef\u80fd\uff09\u3002<\/p>\n<p>\u307e\u305f\u3001<b>\u300c<strong>Command Palette<\/strong>\u300d\u3092<\/b>\u4f7f\u3046\u3053\u3068\u3067\u3001\u3055\u3089\u306a\u308b\u30aa\u30d7\u30b7\u30e7\u30f3\u3082\u5229\u7528\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u306f\u3001<a href=\"https:\/\/www.onivim.io\/\" target=\"_blank\" rel=\"noopener noreferrer\">Onivim2<\/a>\u306e\u3088\u3046\u306aVSCode\u306e\u30aa\u30fc\u30d7\u30f3\u30bd\u30fc\u30b9\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u4e0a\u306b\u69cb\u7bc9\u3055\u308c\u305f\u30a8\u30c7\u30a3\u30bf\u3067\u3082\u540c\u69d8\u3067\u3059\u3002<\/p>\n<figure id=\"attachment_155628\" aria-describedby=\"caption-attachment-155628\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155628 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/onivim-git-merge.png\" alt=\"\u30b3\u30de\u30f3\u30c9\u30d1\u30ec\u30c3\u30c8\u304b\u3089\u300cGit: Merge Branch\u300d\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3059\u308b\uff08Onivim2\uff09\" width=\"1000\" height=\"396\"><figcaption id=\"caption-attachment-155628\" class=\"wp-caption-text\">\u30b3\u30de\u30f3\u30c9\u30d1\u30ec\u30c3\u30c8\u304b\u3089\u300cGit: Merge Branch\u300d\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3059\u308b\uff08Onivim2\uff09<\/figcaption><\/figure>\n<p>\u3053\u306e\u5229\u70b9\u306f\uff08\u3053\u3053\u3067\u7d39\u4ecb\u3057\u3066\u3044\u308b\u3059\u3079\u3066\u306e\u30c4\u30fc\u30eb\u306b\u8a00\u3048\u308b\u3053\u3068\u3067\u3059\u304c\uff09\u30de\u30fc\u30b8\u306b\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u3092\u5fc5\u8981\u3068\u3057\u306a\u3044\u3053\u3068\u3067\u3059\u3002\u901a\u5e38\u3001\u30bd\u30fc\u30b9\u30d6\u30e9\u30f3\u30c1\u3068\u30bf\u30fc\u30b2\u30c3\u30c8\u30d6\u30e9\u30f3\u30c1\u3092\u30c9\u30ed\u30c3\u30d7\u30c0\u30a6\u30f3\u30e1\u30cb\u30e5\u30fc\u304b\u3089\u9078\u629e\u3057\u3001\u30a8\u30c7\u30a3\u30bf\u304b\u3089\u30de\u30fc\u30b8\u3092\u5b9f\u884c\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3068\u306f\u8a00\u3048\u3001\u5b9f\u969b\u306b\u306f\u624b\u52d5\u3067\u306e\u4ecb\u5165\u3092\u884c\u3046\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\u30de\u30fc\u30b8\u5f8c\u306b\u5909\u66f4\u3092\u78ba\u8a8d\u3057\u3001\u5fc5\u8981\u306a\u30b3\u30df\u30c3\u30c8\u3092\u884c\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>\u4ed6\u306b\u3082\u3001<a href=\"https:\/\/kinsta.com\/jp\/blog\/how-to-use-sublime-text\/\" rel=\"noopener\">Sublime Text<\/a>\u306e\u30b0\u30e9\u30d5\u30a3\u30ab\u30eb\u30e6\u30fc\u30b6\u30fc\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\uff08GUI\uff09\u3092\u4f7f\u3063\u3066\u3001Git\u306e\u4f5c\u696d\u3092\u884c\u3046\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\u3053\u306e\u30a8\u30c7\u30a3\u30bf\u3092\u4f7f\u3046\u306a\u3089\u3001<a href=\"https:\/\/www.sublimemerge.com\/\" target=\"_blank\" rel=\"noopener noreferrer\">Sublime Merge<\/a>\u306f\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u7406\u60f3\u7684\u306a\u8ffd\u52a0\u306e\u30c4\u30fc\u30eb\u3068\u306a\u308b\u3053\u3068\u3067\u3057\u3087\u3046\u3002<\/p>\n<figure id=\"attachment_155629\" aria-describedby=\"caption-attachment-155629\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155629 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/sublime-merge.png\" alt=\"Sublime Merge\" width=\"1000\" height=\"498\"><figcaption id=\"caption-attachment-155629\" class=\"wp-caption-text\">Sublime Merge<\/figcaption><\/figure>\n<p>\u3069\u306e\u30b3\u30fc\u30c9\u30a8\u30c7\u30a3\u30bf\u3092\u9078\u3093\u3067\u3082\u3001\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u3092\u4f7f\u308f\u305a\u306bGit\u3092\u64cd\u4f5c\u3067\u304d\u308b\u6a5f\u80fd\u304c\u305f\u304f\u3055\u3093\u3042\u308b\u3053\u3068\u306b\u6c17\u4ed8\u304f\u306f\u305a\u3067\u3059\u3002Vim\u3084Neovim\u3067\u3082\u3001<a href=\"https:\/\/github.com\/tpope\/vim-fugitive\" target=\"_blank\" rel=\"noopener noreferrer\">Tim Pope\u6c0f\u306eGit Fugitive<\/a>\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u4f7f\u3048\u3070\u3001\u7c21\u5358\u306b\u7d20\u6674\u3089\u3057\u3044\u6a5f\u80fd\u304c\u8ffd\u52a0\u3067\u304d\u307e\u3059\u3002<\/p>\n<p>\u307e\u305f\u3001\u3053\u306e\u4f5c\u696d\u3060\u3051\u306b\u7279\u5316\u3057\u305f\u5c02\u7528\u306e\u30b5\u30fc\u30c9\u30d1\u30fc\u30c6\u30a3\u88fd\u30de\u30fc\u30b8\u30c4\u30fc\u30eb\u3082\u3044\u304f\u3064\u304b\u3042\u308a\u307e\u3059\u3002<\/p>\n<h3>\u5c02\u7528\u306eGit\u30de\u30fc\u30b8\u30a2\u30d7\u30ea<\/h3>\n<p>\u305f\u3068\u3048\u3070<a href=\"https:\/\/mergify.com\/\" target=\"_blank\" rel=\"noopener noreferrer\">Mergify<\/a>\u306f\u3001\u7d99\u7d9a\u7684\u30a4\u30f3\u30c6\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\/\u7d99\u7d9a\u7684\u30c7\u30ea\u30d0\u30ea\u30fc\uff08CI\/CD\uff09\u30d1\u30a4\u30d7\u30e9\u30a4\u30f3\u3068\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u7d71\u5408\u3055\u308c\u305f\u3001\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30ec\u30d9\u30eb\u306e\u30b3\u30fc\u30c9\u30de\u30fc\u30b8\u30c4\u30fc\u30eb\u3067\u3059\u3002<\/p>\n<figure id=\"attachment_155626\" aria-describedby=\"caption-attachment-155626\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155626 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/mergify-app.png\" alt=\"Mergify\u306e\u30a6\u30a7\u30d6\u30b5\u30a4\u30c8\" width=\"1000\" height=\"640\"><figcaption id=\"caption-attachment-155626\" class=\"wp-caption-text\">Mergify\u306e\u30a6\u30a7\u30d6\u30b5\u30a4\u30c8<\/figcaption><\/figure>\n<p>\u30de\u30fc\u30b8\u524d\u306e\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u66f4\u65b0\u3092\u81ea\u52d5\u5316\u3057\u305f\u308a\u3001\u512a\u5148\u5ea6\u306b\u57fa\u3065\u3044\u3066\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u4e26\u3079\u66ff\u3048\u305f\u308a\u3001\u30d0\u30c3\u30c1\u51e6\u7406\u3057\u305f\u308a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u307e\u305f\u3001\u30aa\u30fc\u30d7\u30f3\u30bd\u30fc\u30b9\u306e\u30bd\u30ea\u30e5\u30fc\u30b7\u30e7\u30f3\u3068\u3057\u3066\u306f\u3001<a href=\"http:\/\/meldmerge.org\/\" target=\"_blank\" rel=\"noopener noreferrer\">Meld<\/a>\u3092\u691c\u8a0e\u3057\u3066\u307f\u308b\u4fa1\u5024\u306f\u3042\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002<\/p>\n<figure id=\"attachment_155625\" aria-describedby=\"caption-attachment-155625\" style=\"width: 1000px\" class=\"wp-caption aligncenter\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-155625 size-full\" src=\"https:\/\/kinsta.com\/wp-content\/uploads\/2023\/06\/meld-app.png\" alt=\"Meld\u30a2\u30d7\u30ea\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\" width=\"1000\" height=\"651\"><figcaption id=\"caption-attachment-155625\" class=\"wp-caption-text\">Meld\u30a2\u30d7\u30ea\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9<\/figcaption><\/figure>\n<p>Meld\u306e\u5b89\u5b9a\u7248\u30ea\u30ea\u30fc\u30b9\u306f\u3001Windows\u3068<a href=\"https:\/\/kinsta.com\/blog\/linux-commands\/\" rel=\"noopener\">Linux<\/a>\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3001<a href=\"https:\/\/kinsta.com\/learn\/wordpress-gpl\/\" rel=\"noopener\">GPL\u30e9\u30a4\u30bb\u30f3\u30b9<\/a>\u306e\u4e0b\u3067\u6a5f\u80fd\u3057\u307e\u3059\u3002\u30d6\u30e9\u30f3\u30c1\u306e\u6bd4\u8f03\u3084\u30de\u30fc\u30b8\u306e\u7de8\u96c6\u306a\u3069\u3001\u57fa\u672c\u7684\u306a\u6a5f\u80fd\u3092\u5099\u3048\u3066\u304a\u308a\u30012\u65b9\u5411\u307e\u305f\u306f3\u65b9\u5411\u306e\u6bd4\u8f03\u3084\u3001<a href=\"https:\/\/subversion.apache.org\/\" target=\"_blank\" rel=\"noopener noreferrer\">Subversion<\/a>\u306e\u3088\u3046\u306a\u4ed6\u306e<a href=\"https:\/\/kinsta.com\/jp\/blog\/wordpress-version-control\/\" rel=\"noopener\">\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406<\/a>\u30b7\u30b9\u30c6\u30e0\u306e\u30b5\u30dd\u30fc\u30c8\u3082\u3042\u308a\u307e\u3059\u3002<\/p>\n<h2>\u307e\u3068\u3081<\/h2>\n<p>Git\u306f\u3001\u5171\u540c\u4f5c\u696d\u3084\u30b3\u30fc\u30c9\u5909\u66f4\u306e\u52b9\u7387\u7684\u306a\u7ba1\u7406\u306b\u6b20\u304b\u305b\u306a\u3044\u30c4\u30fc\u30eb\u3067\u3059\u3002\u3057\u304b\u3057\u3001\u8907\u6570\u306e\u958b\u767a\u8005\u304c\u540c\u3058\u30b3\u30fc\u30c9\u3067\u4f5c\u696d\u3092\u3059\u308b\u3068\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3059\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002Git\u306e\u30de\u30fc\u30b8\u6226\u7565\u306f\u3001\u3053\u306e\u3088\u3046\u306a\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3059\u308b\u306e\u306b\u6709\u52b9\u3067\u3059\u3002\u8907\u96d1\u306a\u72b6\u6cc1\u4e0b\u3067\u306f\u3001\u9ad8\u5ea6\u306aGit\u306e\u30de\u30fc\u30b8\u6226\u7565\u304c\u5fc5\u8981\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u3082\u3061\u308d\u3093\u3001\u30cd\u30ac\u30c6\u30a3\u30d6\u30b9\u30da\u30fc\u30b9\u3092\u7121\u8996\u3057\u305f\u308a\u691c\u7d22\u30ed\u30b0\u3092\u6f01\u3063\u305f\u308a\u3059\u308b\u3088\u3046\u306a\u30b7\u30f3\u30d7\u30eb\u306a\u4f5c\u696d\u306b\u306a\u308b\u3053\u3068\u3082\u3042\u308a\u307e\u3059\u3002\u3057\u304b\u3057\u3001\u5fc5\u305a\u3057\u3082\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u3092\u4f7f\u3046\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u624b\u52a9\u3051\u3057\u3066\u304f\u308c\u308b\u30a2\u30d7\u30ea\u306f\u305f\u304f\u3055\u3093\u3042\u308a\u307e\u3059\u3057\u3001\u30b3\u30fc\u30c9\u30a8\u30c7\u30a3\u30bf\u306b\u4fbf\u5229\u306a\u6a5f\u80fd\u304c\u642d\u8f09\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3082\u3042\u308a\u307e\u3059\u3002<\/p>\n<p>\u8cea\u3092\u91cd\u8996\u3057\u305f<a href=\"https:\/\/sevalla.com\/application-hosting\/\">\u30a6\u30a7\u30d6\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc<\/a>\u3092\u304a\u63a2\u3057\u3067\u3042\u308c\u3070\u3001Kinsta\u306b\u304a\u4efb\u305b\u304f\u3060\u3055\u3044\u3002\u30af\u30e9\u30a6\u30c9\u30d9\u30fc\u30b9\u306e\u30a6\u30a7\u30d6\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30b5\u30fc\u30d0\u30fc\u30b5\u30fc\u30d3\u30b9\u304c\u3001\u304a\u5ba2\u69d8\u306e\u30d5\u30eb\u30b9\u30bf\u30c3\u30af\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u65e5\u3005\u306e\u7a3c\u50cd\u3068\u6210\u9577\u3092\u5f8c\u62bc\u3057\u3057\u307e\u3059\u3002<\/p>\n<p>\u4eca\u56de\u3054\u7d39\u4ecb\u3057\u305f\u6570\u3005\u306eGit\u30de\u30fc\u30b8\u6226\u7565\u306e\u3046\u3061\u3001\u3069\u308c\u3092\u4f7f\u3048\u3070\u7aae\u5730\u3092\u8131\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b\u3067\u3057\u3087\u3046\u304b\uff1f\u7279\u306b\u6c17\u306b\u306a\u308b\u3082\u306e\u304c\u3054\u3056\u3044\u307e\u3057\u305f\u3089\u3001\u4ee5\u4e0b\u306e\u30b3\u30e1\u30f3\u30c8\u6b04\u3067\u304a\u805e\u304b\u305b\u304f\u3060\u3055\u3044\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u958b\u767a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4f5c\u696d\u3092\u9670\u3067\u652f\u3048\u308b\u306e\u304cGit\u3067\u3059\u3002\u3057 &#8230;<\/p>\n","protected":false},"author":199,"featured_media":47365,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_kinsta_gated_content":false,"_kinsta_gated_content_redirect":"","footnotes":""},"tags":[],"topic":[770],"class_list":["post-47364","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","topic-git"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v24.6 (Yoast SEO v24.6) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9\uff5cKinsta\u00ae<\/title>\n<meta name=\"description\" content=\"\u305f\u304f\u3055\u3093\u306e\u30b3\u30df\u30c3\u30c8\u3092\u51e6\u7406\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u5834\u5408\u3001\u4e2d\u306b\u306f\u4ed6\u306e\u30b3\u30df\u30c3\u30c8\u3068\u885d\u7a81\u3057\u3066\u30de\u30fc\u30b8\u304c\u5fc5\u8981\u306b\u306a\u308b\u3082\u306e\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u8907\u96d1\u306aGit\u306e\u30de\u30fc\u30b8\u4f5c\u696d\u3092\u884c\u3046\u65b9\u6cd5\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002\" \/>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/\" \/>\n<meta property=\"og:locale\" content=\"ja_JP\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9\" \/>\n<meta property=\"og:description\" content=\"\u305f\u304f\u3055\u3093\u306e\u30b3\u30df\u30c3\u30c8\u3092\u51e6\u7406\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u5834\u5408\u3001\u4e2d\u306b\u306f\u4ed6\u306e\u30b3\u30df\u30c3\u30c8\u3068\u885d\u7a81\u3057\u3066\u30de\u30fc\u30b8\u304c\u5fc5\u8981\u306b\u306a\u308b\u3082\u306e\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u8907\u96d1\u306aGit\u306e\u30de\u30fc\u30b8\u4f5c\u696d\u3092\u884c\u3046\u65b9\u6cd5\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002\" \/>\n<meta property=\"og:url\" content=\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/\" \/>\n<meta property=\"og:site_name\" content=\"Kinsta\u00ae\" \/>\n<meta property=\"article:publisher\" content=\"https:\/\/www.facebook.com\/Kinsta-Japan-334616080691171\/\" \/>\n<meta property=\"article:published_time\" content=\"2023-12-12T10:29:14+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2023-12-15T09:45:13+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg\" \/>\n\t<meta property=\"og:image:width\" content=\"1460\" \/>\n\t<meta property=\"og:image:height\" content=\"730\" \/>\n\t<meta property=\"og:image:type\" content=\"image\/jpeg\" \/>\n<meta name=\"author\" content=\"Jeremy Holcombe\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:description\" content=\"\u305f\u304f\u3055\u3093\u306e\u30b3\u30df\u30c3\u30c8\u3092\u51e6\u7406\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u5834\u5408\u3001\u4e2d\u306b\u306f\u4ed6\u306e\u30b3\u30df\u30c3\u30c8\u3068\u885d\u7a81\u3057\u3066\u30de\u30fc\u30b8\u304c\u5fc5\u8981\u306b\u306a\u308b\u3082\u306e\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u8907\u96d1\u306aGit\u306e\u30de\u30fc\u30b8\u4f5c\u696d\u3092\u884c\u3046\u65b9\u6cd5\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002\" \/>\n<meta name=\"twitter:image\" content=\"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg\" \/>\n<meta name=\"twitter:creator\" content=\"@Kinsta_JP\" \/>\n<meta name=\"twitter:site\" content=\"@Kinsta_JP\" \/>\n<meta name=\"twitter:label1\" content=\"\u57f7\u7b46\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"Jeremy Holcombe\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u63a8\u5b9a\u8aad\u307f\u53d6\u308a\u6642\u9593\" \/>\n\t<meta name=\"twitter:data2\" content=\"5\u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#article\",\"isPartOf\":{\"@id\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/\"},\"author\":{\"name\":\"Jeremy Holcombe\",\"@id\":\"https:\/\/kinsta.com\/jp\/#\/schema\/person\/4eee42881d7b5a73ebb4f58dd5223b21\"},\"headline\":\"\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9\",\"datePublished\":\"2023-12-12T10:29:14+00:00\",\"dateModified\":\"2023-12-15T09:45:13+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/\"},\"wordCount\":264,\"commentCount\":0,\"publisher\":{\"@id\":\"https:\/\/kinsta.com\/jp\/#organization\"},\"image\":{\"@id\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#primaryimage\"},\"thumbnailUrl\":\"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg\",\"inLanguage\":\"ja\",\"potentialAction\":[{\"@type\":\"CommentAction\",\"name\":\"Comment\",\"target\":[\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#respond\"]}]},{\"@type\":\"WebPage\",\"@id\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/\",\"url\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/\",\"name\":\"\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9\uff5cKinsta\u00ae\",\"isPartOf\":{\"@id\":\"https:\/\/kinsta.com\/jp\/#website\"},\"primaryImageOfPage\":{\"@id\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#primaryimage\"},\"image\":{\"@id\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#primaryimage\"},\"thumbnailUrl\":\"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg\",\"datePublished\":\"2023-12-12T10:29:14+00:00\",\"dateModified\":\"2023-12-15T09:45:13+00:00\",\"description\":\"\u305f\u304f\u3055\u3093\u306e\u30b3\u30df\u30c3\u30c8\u3092\u51e6\u7406\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u5834\u5408\u3001\u4e2d\u306b\u306f\u4ed6\u306e\u30b3\u30df\u30c3\u30c8\u3068\u885d\u7a81\u3057\u3066\u30de\u30fc\u30b8\u304c\u5fc5\u8981\u306b\u306a\u308b\u3082\u306e\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u8907\u96d1\u306aGit\u306e\u30de\u30fc\u30b8\u4f5c\u696d\u3092\u884c\u3046\u65b9\u6cd5\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002\",\"breadcrumb\":{\"@id\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#breadcrumb\"},\"inLanguage\":\"ja\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/\"]}]},{\"@type\":\"ImageObject\",\"inLanguage\":\"ja\",\"@id\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#primaryimage\",\"url\":\"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg\",\"contentUrl\":\"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg\",\"width\":1460,\"height\":730},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\/\/kinsta.com\/jp\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\",\"item\":\"https:\/\/kinsta.com\/jp\/topics\/git\/\"},{\"@type\":\"ListItem\",\"position\":3,\"name\":\"\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/kinsta.com\/jp\/#website\",\"url\":\"https:\/\/kinsta.com\/jp\/\",\"name\":\"Kinsta\u00ae\",\"description\":\"\u9ad8\u901f\u304b\u3064\u5805\u7262\u306a\u30d7\u30ec\u30df\u30a2\u30e0\u30b5\u30fc\u30d0\u30fc\u30b5\u30fc\u30d3\u30b9\",\"publisher\":{\"@id\":\"https:\/\/kinsta.com\/jp\/#organization\"},\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/kinsta.com\/jp\/?s={search_term_string}\"},\"query-input\":{\"@type\":\"PropertyValueSpecification\",\"valueRequired\":true,\"valueName\":\"search_term_string\"}}],\"inLanguage\":\"ja\"},{\"@type\":\"Organization\",\"@id\":\"https:\/\/kinsta.com\/jp\/#organization\",\"name\":\"Kinsta\",\"url\":\"https:\/\/kinsta.com\/jp\/\",\"logo\":{\"@type\":\"ImageObject\",\"inLanguage\":\"ja\",\"@id\":\"https:\/\/kinsta.com\/jp\/#\/schema\/logo\/image\/\",\"url\":\"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/12\/kinsta-logo.jpeg\",\"contentUrl\":\"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/12\/kinsta-logo.jpeg\",\"width\":500,\"height\":500,\"caption\":\"Kinsta\"},\"image\":{\"@id\":\"https:\/\/kinsta.com\/jp\/#\/schema\/logo\/image\/\"},\"sameAs\":[\"https:\/\/www.facebook.com\/Kinsta-Japan-334616080691171\/\",\"https:\/\/x.com\/Kinsta_JP\",\"https:\/\/www.instagram.com\/kinstahosting\/\",\"https:\/\/www.linkedin.com\/company\/kinsta\/\",\"https:\/\/www.pinterest.com\/kinstahosting\/\",\"https:\/\/www.youtube.com\/c\/Kinsta\"]},{\"@type\":\"Person\",\"@id\":\"https:\/\/kinsta.com\/jp\/#\/schema\/person\/4eee42881d7b5a73ebb4f58dd5223b21\",\"name\":\"Jeremy Holcombe\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"ja\",\"@id\":\"https:\/\/kinsta.com\/jp\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/0e17001f3bb37dbbe54fceef9bb547fa?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/0e17001f3bb37dbbe54fceef9bb547fa?s=96&d=mm&r=g\",\"caption\":\"Jeremy Holcombe\"},\"description\":\"Senior Editor at Kinsta, WordPress Web Developer, and Content Writer. Outside of all things WordPress, I enjoy the beach, golf, and movies. I also have tall people problems.\",\"sameAs\":[\"https:\/\/www.linkedin.com\/in\/jeremyholcombe\/\"],\"url\":\"https:\/\/kinsta.com\/jp\/blog\/author\/jeremyholcombe\/\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9\uff5cKinsta\u00ae","description":"\u305f\u304f\u3055\u3093\u306e\u30b3\u30df\u30c3\u30c8\u3092\u51e6\u7406\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u5834\u5408\u3001\u4e2d\u306b\u306f\u4ed6\u306e\u30b3\u30df\u30c3\u30c8\u3068\u885d\u7a81\u3057\u3066\u30de\u30fc\u30b8\u304c\u5fc5\u8981\u306b\u306a\u308b\u3082\u306e\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u8907\u96d1\u306aGit\u306e\u30de\u30fc\u30b8\u4f5c\u696d\u3092\u884c\u3046\u65b9\u6cd5\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002","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:\/\/kinsta.com\/jp\/blog\/git-merge\/","og_locale":"ja_JP","og_type":"article","og_title":"\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9","og_description":"\u305f\u304f\u3055\u3093\u306e\u30b3\u30df\u30c3\u30c8\u3092\u51e6\u7406\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u5834\u5408\u3001\u4e2d\u306b\u306f\u4ed6\u306e\u30b3\u30df\u30c3\u30c8\u3068\u885d\u7a81\u3057\u3066\u30de\u30fc\u30b8\u304c\u5fc5\u8981\u306b\u306a\u308b\u3082\u306e\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u8907\u96d1\u306aGit\u306e\u30de\u30fc\u30b8\u4f5c\u696d\u3092\u884c\u3046\u65b9\u6cd5\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002","og_url":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/","og_site_name":"Kinsta\u00ae","article_publisher":"https:\/\/www.facebook.com\/Kinsta-Japan-334616080691171\/","article_published_time":"2023-12-12T10:29:14+00:00","article_modified_time":"2023-12-15T09:45:13+00:00","og_image":[{"width":1460,"height":730,"url":"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg","type":"image\/jpeg"}],"author":"Jeremy Holcombe","twitter_card":"summary_large_image","twitter_description":"\u305f\u304f\u3055\u3093\u306e\u30b3\u30df\u30c3\u30c8\u3092\u51e6\u7406\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u5834\u5408\u3001\u4e2d\u306b\u306f\u4ed6\u306e\u30b3\u30df\u30c3\u30c8\u3068\u885d\u7a81\u3057\u3066\u30de\u30fc\u30b8\u304c\u5fc5\u8981\u306b\u306a\u308b\u3082\u306e\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u8907\u96d1\u306aGit\u306e\u30de\u30fc\u30b8\u4f5c\u696d\u3092\u884c\u3046\u65b9\u6cd5\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002","twitter_image":"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg","twitter_creator":"@Kinsta_JP","twitter_site":"@Kinsta_JP","twitter_misc":{"\u57f7\u7b46\u8005":"Jeremy Holcombe","\u63a8\u5b9a\u8aad\u307f\u53d6\u308a\u6642\u9593":"5\u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#article","isPartOf":{"@id":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/"},"author":{"name":"Jeremy Holcombe","@id":"https:\/\/kinsta.com\/jp\/#\/schema\/person\/4eee42881d7b5a73ebb4f58dd5223b21"},"headline":"\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9","datePublished":"2023-12-12T10:29:14+00:00","dateModified":"2023-12-15T09:45:13+00:00","mainEntityOfPage":{"@id":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/"},"wordCount":264,"commentCount":0,"publisher":{"@id":"https:\/\/kinsta.com\/jp\/#organization"},"image":{"@id":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#primaryimage"},"thumbnailUrl":"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg","inLanguage":"ja","potentialAction":[{"@type":"CommentAction","name":"Comment","target":["https:\/\/kinsta.com\/jp\/blog\/git-merge\/#respond"]}]},{"@type":"WebPage","@id":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/","url":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/","name":"\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9\uff5cKinsta\u00ae","isPartOf":{"@id":"https:\/\/kinsta.com\/jp\/#website"},"primaryImageOfPage":{"@id":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#primaryimage"},"image":{"@id":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#primaryimage"},"thumbnailUrl":"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg","datePublished":"2023-12-12T10:29:14+00:00","dateModified":"2023-12-15T09:45:13+00:00","description":"\u305f\u304f\u3055\u3093\u306e\u30b3\u30df\u30c3\u30c8\u3092\u51e6\u7406\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u3044\u5834\u5408\u3001\u4e2d\u306b\u306f\u4ed6\u306e\u30b3\u30df\u30c3\u30c8\u3068\u885d\u7a81\u3057\u3066\u30de\u30fc\u30b8\u304c\u5fc5\u8981\u306b\u306a\u308b\u3082\u306e\u3082\u3042\u308b\u3067\u3057\u3087\u3046\u3002\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u8907\u96d1\u306aGit\u306e\u30de\u30fc\u30b8\u4f5c\u696d\u3092\u884c\u3046\u65b9\u6cd5\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002","breadcrumb":{"@id":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#breadcrumb"},"inLanguage":"ja","potentialAction":[{"@type":"ReadAction","target":["https:\/\/kinsta.com\/jp\/blog\/git-merge\/"]}]},{"@type":"ImageObject","inLanguage":"ja","@id":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#primaryimage","url":"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg","contentUrl":"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/06\/git-merge.jpg","width":1460,"height":730},{"@type":"BreadcrumbList","@id":"https:\/\/kinsta.com\/jp\/blog\/git-merge\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"Home","item":"https:\/\/kinsta.com\/jp\/"},{"@type":"ListItem","position":2,"name":"Git","item":"https:\/\/kinsta.com\/jp\/topics\/git\/"},{"@type":"ListItem","position":3,"name":"\u8907\u96d1\u306aGit\u30de\u30fc\u30b8\u4f5c\u696d\u306e\u9032\u3081\u65b9"}]},{"@type":"WebSite","@id":"https:\/\/kinsta.com\/jp\/#website","url":"https:\/\/kinsta.com\/jp\/","name":"Kinsta\u00ae","description":"\u9ad8\u901f\u304b\u3064\u5805\u7262\u306a\u30d7\u30ec\u30df\u30a2\u30e0\u30b5\u30fc\u30d0\u30fc\u30b5\u30fc\u30d3\u30b9","publisher":{"@id":"https:\/\/kinsta.com\/jp\/#organization"},"potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/kinsta.com\/jp\/?s={search_term_string}"},"query-input":{"@type":"PropertyValueSpecification","valueRequired":true,"valueName":"search_term_string"}}],"inLanguage":"ja"},{"@type":"Organization","@id":"https:\/\/kinsta.com\/jp\/#organization","name":"Kinsta","url":"https:\/\/kinsta.com\/jp\/","logo":{"@type":"ImageObject","inLanguage":"ja","@id":"https:\/\/kinsta.com\/jp\/#\/schema\/logo\/image\/","url":"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/12\/kinsta-logo.jpeg","contentUrl":"https:\/\/kinsta.com\/jp\/wp-content\/uploads\/sites\/6\/2023\/12\/kinsta-logo.jpeg","width":500,"height":500,"caption":"Kinsta"},"image":{"@id":"https:\/\/kinsta.com\/jp\/#\/schema\/logo\/image\/"},"sameAs":["https:\/\/www.facebook.com\/Kinsta-Japan-334616080691171\/","https:\/\/x.com\/Kinsta_JP","https:\/\/www.instagram.com\/kinstahosting\/","https:\/\/www.linkedin.com\/company\/kinsta\/","https:\/\/www.pinterest.com\/kinstahosting\/","https:\/\/www.youtube.com\/c\/Kinsta"]},{"@type":"Person","@id":"https:\/\/kinsta.com\/jp\/#\/schema\/person\/4eee42881d7b5a73ebb4f58dd5223b21","name":"Jeremy Holcombe","image":{"@type":"ImageObject","inLanguage":"ja","@id":"https:\/\/kinsta.com\/jp\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/0e17001f3bb37dbbe54fceef9bb547fa?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/0e17001f3bb37dbbe54fceef9bb547fa?s=96&d=mm&r=g","caption":"Jeremy Holcombe"},"description":"Senior Editor at Kinsta, WordPress Web Developer, and Content Writer. Outside of all things WordPress, I enjoy the beach, golf, and movies. I also have tall people problems.","sameAs":["https:\/\/www.linkedin.com\/in\/jeremyholcombe\/"],"url":"https:\/\/kinsta.com\/jp\/blog\/author\/jeremyholcombe\/"}]}},"acf":[],"_links":{"self":[{"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/posts\/47364","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/users\/199"}],"replies":[{"embeddable":true,"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/comments?post=47364"}],"version-history":[{"count":14,"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/posts\/47364\/revisions"}],"predecessor-version":[{"id":53406,"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/posts\/47364\/revisions\/53406"}],"alternate":[{"embeddable":true,"hreflang":"en","title":"English","href":"https:\/\/kinsta.com\/jp\/wp-json\/kinsta\/v1\/posts\/47364\/translations\/en"},{"embeddable":true,"hreflang":"it","title":"Italian","href":"https:\/\/kinsta.com\/jp\/wp-json\/kinsta\/v1\/posts\/47364\/translations\/it"},{"embeddable":true,"hreflang":"pt","title":"Portuguese","href":"https:\/\/kinsta.com\/jp\/wp-json\/kinsta\/v1\/posts\/47364\/translations\/pt"},{"embeddable":true,"hreflang":"fr","title":"French","href":"https:\/\/kinsta.com\/jp\/wp-json\/kinsta\/v1\/posts\/47364\/translations\/fr"},{"embeddable":true,"hreflang":"de","title":"German","href":"https:\/\/kinsta.com\/jp\/wp-json\/kinsta\/v1\/posts\/47364\/translations\/de"},{"embeddable":true,"hreflang":"ja","title":"Japanese","href":"https:\/\/kinsta.com\/jp\/wp-json\/kinsta\/v1\/posts\/47364\/translations\/jp"},{"embeddable":true,"hreflang":"nl","title":"Dutch","href":"https:\/\/kinsta.com\/jp\/wp-json\/kinsta\/v1\/posts\/47364\/translations\/nl"},{"embeddable":true,"hreflang":"es","title":"Spanish","href":"https:\/\/kinsta.com\/jp\/wp-json\/kinsta\/v1\/posts\/47364\/translations\/es"},{"href":"https:\/\/kinsta.com\/jp\/wp-json\/kinsta\/v1\/posts\/47364\/tree"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/media\/47365"}],"wp:attachment":[{"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/media?parent=47364"}],"wp:term":[{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/tags?post=47364"},{"taxonomy":"topic","embeddable":true,"href":"https:\/\/kinsta.com\/jp\/wp-json\/wp\/v2\/topic?post=47364"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}