{"id":10304,"date":"2026-03-09T20:14:32","date_gmt":"2026-03-09T11:14:32","guid":{"rendered":"https:\/\/techmania.jp\/blog\/?p=10304"},"modified":"2026-03-09T20:14:34","modified_gmt":"2026-03-09T11:14:34","slug":"git-merge","status":"publish","type":"post","link":"https:\/\/techmania.jp\/blog\/git-merge\/","title":{"rendered":"\u3010Git\u5165\u9580\u3011merge\u30b3\u30de\u30f3\u30c9\u3067\u7570\u306a\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u5185\u5bb9\u3092\u7d71\u5408\u3059\u308b"},"content":{"rendered":"\n<p>git \u3092\u4f7f\u3063\u3066\u4f5c\u696d\u3092\u884c\u3046\u5834\u5408\u3001\u30d6\u30e9\u30f3\u30c1\u306e\u5185\u5bb9\u3092\uff11\u3064\u306b\u7d71\u5408\u3059\u308b\u5fc5\u8981\u304c\u51fa\u3066\u304f\u308b\u6642\u304c\u3042\u308a\u307e\u3059\u3002<br>\u305d\u306e\u969b\u306b\u4f7f\u7528\u3059\u308b\u306e\u304c\u3001git merge \u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<\/p>\n\n\n\n<p>\u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001git merge \u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3059\u308b\u5177\u4f53\u7684\u306a\u65b9\u6cd5\u306b\u3064\u3044\u3066\u89e3\u8aac\u3057\u3066\u3044\u304d\u305f\u3044\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n\n\n\n<h2 id=\"outline__1\" class=\"wp-block-heading\">git merge\u3068\u306f\uff1f<\/h2>\n\n\n\n<p>git merge \u30b3\u30de\u30f3\u30c9\u306f\u3001\u7279\u5b9a\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u30b3\u30df\u30c3\u30c8\u3055\u308c\u305f\u66f4\u65b0\u5185\u5bb9\u3092\u5225\u306e\u30d6\u30e9\u30f3\u30c1\u3078\u3068\u53cd\u6620\u3059\u308b\u969b\u306b\u4f7f\u7528\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<\/p>\n\n\n\n<p>Git\u306f\u57fa\u672c\u7684\u306b\u3001\u4f5c\u696d\u8005\u3084\u4fee\u6b63\u5185\u5bb9\u3054\u3068\u306b\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u3063\u3066\u4f5c\u696d\u3092\u884c\u3046\u306e\u304c\u4e00\u822c\u7684\u306a\u305f\u3081\u3001\u6700\u7d42\u7684\u306b\u4fee\u6b63\u5185\u5bb9\u3092\u30e1\u30a4\u30f3\u30d6\u30e9\u30f3\u30c1\u3078\u3068\u53cd\u6620\u3055\u305b\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002<br>\u305d\u306e\u969b\u306b\u4f7f\u7528\u3059\u308b\u306e\u304c\u3053\u306e merge\u30b3\u30de\u30f3\u30c9\u3067\u3001\u5185\u5bb9\u3092\u53d6\u308a\u8fbc\u307f\u305f\u3044\u30d6\u30e9\u30f3\u30c1\u3067\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u306b\u3088\u308a\u3001\u5bfe\u8c61\u3068\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u66f4\u65b0\u5185\u5bb9\u3092\u5b9f\u884c\u5143\u3067\u3042\u308b\u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u306b\u53cd\u6620\u3055\u305b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n\n\n\n<h2 id=\"outline__2\" class=\"wp-block-heading\">merge\u30b3\u30de\u30f3\u30c9\u306e\u4f7f\u3044\u65b9<\/h2>\n\n\n\n<p>merge\u30b3\u30de\u30f3\u30c9\u306e\u5177\u4f53\u7684\u306a\u4f7f\u7528\u65b9\u6cd5\u306b\u3064\u3044\u3066\u898b\u3066\u3044\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n\n<h3 id=\"outline__2_1\" class=\"wp-block-heading\">\u57fa\u672c\u69cb\u6587<\/h3>\n\n\n\n<p>merge\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3059\u308b\u969b\u306f\u3001\u53d6\u308a\u8fbc\u307f\u5148\u3068\u306a\u308b\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3057\u305f\u5f8c\u3001\u4ee5\u4e0b\u306e\u69cb\u6587\u3067\u5b9f\u884c\u3057\u307e\u3059\u3002<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro\" data-code-block-pro-font-family=\"Code-Pro-JetBrains-Mono-NL.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-JetBrains-Mono-NL,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 10px 16px;margin-bottom:-2px;width:100%;text-align:left;background-color:#304047;color:#d5ffff\">Bash<\/span><span role=\"button\" tabindex=\"0\" style=\"color:#EEFFFF;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>git merge \u30d6\u30e9\u30f3\u30c1\u540d<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M4.5 12.75l6 6 9-13.5\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M16.5 8.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v8.25A2.25 2.25 0 006 16.5h2.25m8.25-8.25H18a2.25 2.25 0 012.25 2.25V18A2.25 2.25 0 0118 20.25h-7.5A2.25 2.25 0 018.25 18v-1.5m8.25-8.25h-6a2.25 2.25 0 00-2.25 2.25v6\"><\/path><\/svg><\/span><pre class=\"shiki material-theme\" style=\"background-color: #263238\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #FFCB6B\">git<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">merge<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">\u30d6\u30e9\u30f3\u30c1\u540d<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\u4f8b\u3048\u3070\u3001\u300c\u30d6\u30e9\u30f3\u30c1B\u3067\u884c\u3063\u305f\u4f5c\u696d\u5185\u5bb9\u3092\u30d6\u30e9\u30f3\u30c1A\u306b\u53d6\u308a\u8fbc\u307f\u305f\u3044\u300d \u3068\u3044\u3063\u305f\u5834\u5408\u3001\u6b21\u306e\u3088\u3046\u306a\u624b\u9806\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro\" data-code-block-pro-font-family=\"Code-Pro-JetBrains-Mono-NL.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-JetBrains-Mono-NL,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 10px 16px;margin-bottom:-2px;width:100%;text-align:left;background-color:#304047;color:#d5ffff\">Bash<\/span><span role=\"button\" tabindex=\"0\" style=\"color:#EEFFFF;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly># \u53d6\u308a\u8fbc\u307f\u5148\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\ngit switch \u30d6\u30e9\u30f3\u30c1A\n\n# \u30d6\u30e9\u30f3\u30c1B\u3092\u30d6\u30e9\u30f3\u30c1A\u306b\u30de\u30fc\u30b8\ngit merge \u30d6\u30e9\u30f3\u30c1B<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M4.5 12.75l6 6 9-13.5\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M16.5 8.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v8.25A2.25 2.25 0 006 16.5h2.25m8.25-8.25H18a2.25 2.25 0 012.25 2.25V18A2.25 2.25 0 0118 20.25h-7.5A2.25 2.25 0 018.25 18v-1.5m8.25-8.25h-6a2.25 2.25 0 00-2.25 2.25v6\"><\/path><\/svg><\/span><pre class=\"shiki material-theme\" style=\"background-color: #263238\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #546E7A; font-style: italic\"># \u53d6\u308a\u8fbc\u307f\u5148\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5<\/span><\/span>\n<span class=\"line\"><span style=\"color: #FFCB6B\">git<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">switch<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">\u30d6\u30e9\u30f3\u30c1A<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #546E7A; font-style: italic\"># \u30d6\u30e9\u30f3\u30c1B\u3092\u30d6\u30e9\u30f3\u30c1A\u306b\u30de\u30fc\u30b8<\/span><\/span>\n<span class=\"line\"><span style=\"color: #FFCB6B\">git<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">merge<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">\u30d6\u30e9\u30f3\u30c1B<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<h2 id=\"outline__3\" class=\"wp-block-heading\">merge\u3057\u305f\u969b\u306b\u6642\u6298\u767a\u751f\u3059\u308b\u300c\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u300d\u3068\u306f\uff1f<\/h2>\n\n\n\n<p>\u30d6\u30e9\u30f3\u30c1\u306e\u72b6\u614b\u306b\u3088\u3063\u3066\u306f\u3001git merge \u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u305f\u969b\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8(\u7af6\u5408) \u304c\u767a\u751f\u3059\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002<br>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3068\u306f\u3001marge\u30b3\u30de\u30f3\u30c9\u3084 rebase\u30b3\u30de\u30f3\u30c9\u306a\u3069\u3067\u30d6\u30e9\u30f3\u30c1\u306e\u66f4\u65b0\u5185\u5bb9\u3092\u7d71\u5408\u3059\u308b\u969b\u306b\u3001\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u540c\u4e00\u7b87\u6240\u306e\u7de8\u96c6\u3092\u305d\u308c\u305e\u308c\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u884c\u3063\u3066\u3044\u308b\u3068\u767a\u751f\u3059\u308b\u7af6\u5408\u72b6\u614b\u306e\u3053\u3068\u3092\u8a00\u3044\u307e\u3059\u3002<\/p>\n\n\n\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3059\u308b\u3068\u3001\u30d7\u30ed\u30b0\u30e9\u30e0\u5074\u3067\u306f\u7570\u306a\u308b\u5909\u66f4\u5185\u5bb9\u3092\u3069\u306e\u3088\u3046\u306b\u7d71\u5408\u3059\u308b\u304b\u3092\u5224\u65ad\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u306a\u3044\u305f\u3081\u3001\u30b3\u30de\u30f3\u30c9\u306e\u5b9f\u884c\u304c\u4e2d\u65ad\u3055\u308c\u307e\u3059\u3002<br>\u3053\u306e\u5834\u5408\u3001\u8a72\u5f53\u7b87\u6240\u306e\u5909\u66f4\u5185\u5bb9\u3092\u3069\u306e\u3088\u3046\u306b\u6b8b\u3059\u304b\u3092\u7de8\u96c6\u3057\u3001\u30d5\u30a1\u30a4\u30eb\u306e\u7af6\u5408\u72b6\u614b\u3092\u89e3\u6d88\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093\u3002<\/p>\n\n\n\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6d88\u65b9\u6cd5\u306f\u3001\u624b\u52d5\u3067\u8a72\u5f53\u7b87\u6240\u3092\u7de8\u96c6\u3059\u308b\u65b9\u6cd5\u3068\u3001\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3057\u3066\u81ea\u52d5\u7684\u306b\u89e3\u6d88\u3059\u308b2\u901a\u308a\u306e\u65b9\u6cd5\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n\n\n\n<h2 id=\"outline__4\" class=\"wp-block-heading\">\u624b\u52d5\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3059\u308b<\/h2>\n\n\n\n<p>\u307e\u305a\u306f\u3001\u624b\u52d5\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3059\u308b\u65b9\u6cd5\u304b\u3089\u898b\u3066\u3044\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n\n<p>\u4e3b\u306a\u5b9f\u884c\u624b\u9806\u306f\u3001\u4ee5\u4e0b\u306e3\u30b9\u30c6\u30c3\u30d7\u3068\u306a\u308a\u307e\u3059\u3002<\/p>\n\n\n\n<ol class=\"wp-block-list\">\n<li>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u78ba\u8a8d\u3059\u308b<\/li>\n\n\n\n<li>\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u66f4\u65b0\u5185\u5bb9\u3092\u7de8\u96c6\u3059\u308b<\/li>\n\n\n\n<li>\u7de8\u96c6\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u30b3\u30df\u30c3\u30c8\u3059\u308b<\/li>\n<\/ol>\n\n\n\n<h3 id=\"outline__4_1\" class=\"wp-block-heading\">\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u3066\u3044\u308b\u7b87\u6240\u3092\u78ba\u8a8d\u3059\u308b<\/h3>\n\n\n\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3059\u308b\u3068\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u30a8\u30e9\u30fc\u6587\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro\" data-code-block-pro-font-family=\"Code-Pro-JetBrains-Mono-NL.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-JetBrains-Mono-NL,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 10px 16px;margin-bottom:-2px;width:100%;text-align:left;background-color:#304047;color:#d5ffff\">\u30a8\u30e9\u30fc\u4f8b<\/span><span role=\"button\" tabindex=\"0\" style=\"color:#EEFFFF;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>Auto-merging sample.txt\nCONFLICT (content): Merge conflict in sample.txt\nAutomatic merge failed; fix conflicts and then commit the result.<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M4.5 12.75l6 6 9-13.5\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M16.5 8.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v8.25A2.25 2.25 0 006 16.5h2.25m8.25-8.25H18a2.25 2.25 0 012.25 2.25V18A2.25 2.25 0 0118 20.25h-7.5A2.25 2.25 0 018.25 18v-1.5m8.25-8.25h-6a2.25 2.25 0 00-2.25 2.25v6\"><\/path><\/svg><\/span><pre class=\"shiki material-theme\" style=\"background-color: #263238\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #EEFFFF\">Auto-merging sample.txt<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">CONFLICT (content): Merge conflict in sample.txt<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">Automatic merge failed; fix conflicts and then commit the result.<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\u30a8\u30e9\u30fc\u306e\u5185\u5bb9\u3092\u898b\u308b\u3068\u3001\u300cMerge conflict in sample.txt\u300d \u3068\u3042\u308b\u3088\u3046\u306b\u3001sample.txt \u30d5\u30a1\u30a4\u30eb\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u3066\u3044\u308b\u3053\u3068\u304c\u5206\u304b\u308a\u307e\u3059\u3002<br>\u3053\u306e\u3088\u3046\u306b\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u5834\u5408\u306f\u30a8\u30e9\u30fc\u6587\u306b\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u4e2d\u8eab\u3092\u78ba\u8a8d\u3059\u308b\u3088\u3046\u306b\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n\n<p>\u307e\u305f\u3001git status \u30b3\u30de\u30f3\u30c9\u3067\u30d6\u30e9\u30f3\u30c1\u306e\u72b6\u614b\u3092\u8868\u793a\u3059\u308b\u3053\u3068\u3067\u3082\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u78ba\u8a8d\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro\" data-code-block-pro-font-family=\"Code-Pro-JetBrains-Mono-NL.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-JetBrains-Mono-NL,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 10px 16px;margin-bottom:-2px;width:100%;text-align:left;background-color:#304047;color:#d5ffff\">Bash<\/span><span role=\"button\" tabindex=\"0\" style=\"color:#EEFFFF;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>git status<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M4.5 12.75l6 6 9-13.5\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M16.5 8.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v8.25A2.25 2.25 0 006 16.5h2.25m8.25-8.25H18a2.25 2.25 0 012.25 2.25V18A2.25 2.25 0 0118 20.25h-7.5A2.25 2.25 0 018.25 18v-1.5m8.25-8.25h-6a2.25 2.25 0 00-2.25 2.25v6\"><\/path><\/svg><\/span><pre class=\"shiki material-theme\" style=\"background-color: #263238\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #FFCB6B\">git<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">status<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro\" data-code-block-pro-font-family=\"Code-Pro-JetBrains-Mono-NL.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-JetBrains-Mono-NL,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span role=\"button\" tabindex=\"0\" style=\"color:#EEFFFF;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>On branch main\nYou have unmerged paths.\n  (fix conflicts and run \"git commit\")\n  (use \"git merge --abort\" to abort the merge)\n\nUnmerged paths:\n  (use \"git add &lt;file>...\" to mark resolution)\n\tboth modified:   sample.txt\n\nno changes added to commit (use \"git add\" and\/or \"git commit -a\")<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M4.5 12.75l6 6 9-13.5\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M16.5 8.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v8.25A2.25 2.25 0 006 16.5h2.25m8.25-8.25H18a2.25 2.25 0 012.25 2.25V18A2.25 2.25 0 0118 20.25h-7.5A2.25 2.25 0 018.25 18v-1.5m8.25-8.25h-6a2.25 2.25 0 00-2.25 2.25v6\"><\/path><\/svg><\/span><pre class=\"shiki material-theme\" style=\"background-color: #263238\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #EEFFFF\">On branch main<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">You have unmerged paths.<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">  (fix conflicts and run &quot;git commit&quot;)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">  (use &quot;git merge --abort&quot; to abort the merge)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\"><\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">Unmerged paths:<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">  (use &quot;git add &lt;file&gt;...&quot; to mark resolution)<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">\tboth modified:   sample.txt<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\"><\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">no changes added to commit (use &quot;git add&quot; and\/or &quot;git commit -a&quot;)<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<h3 id=\"outline__4_2\" class=\"wp-block-heading\">\u30d5\u30a1\u30a4\u30eb\u5185\u3092\u78ba\u8a8d\u3057\u3066\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3059\u308b<\/h3>\n\n\n\n<p>\u8a72\u5f53\u30d5\u30a1\u30a4\u30eb\u306e\u78ba\u8a8d\u304c\u5b8c\u4e86\u3057\u305f\u3089\u3001\u5b9f\u969b\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u3044\u3066\u66f4\u65b0\u5185\u5bb9\u3092\u7de8\u96c6\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3059\u308b\u3068\u3001\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u7af6\u5408\u3057\u3066\u3044\u308b\u7b87\u6240\u306b\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u3068\u547c\u3070\u308c\u308b\u8868\u793a\u304c\u81ea\u52d5\u3067\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002<br>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u5f62\u5f0f\u3067\u3001\u30de\u30fc\u30b8\u5148\u306e\u30d6\u30e9\u30f3\u30c1 (\u4f5c\u696d\u30d6\u30e9\u30f3\u30c1) \u306e\u66f4\u65b0\u5185\u5bb9\u3068\u3001\u53d6\u308a\u8fbc\u307f\u5143\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u66f4\u65b0\u5185\u5bb9\u304c\u305d\u308c\u305e\u308c\u8a18\u8ff0\u3055\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro\" data-code-block-pro-font-family=\"Code-Pro-JetBrains-Mono-NL.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-JetBrains-Mono-NL,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 10px 16px;margin-bottom:-2px;width:100%;text-align:left;background-color:#304047;color:#d5ffff\">\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u4f8b<\/span><span role=\"button\" tabindex=\"0\" style=\"color:#EEFFFF;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\nsample1\n=======\nsample2\n>>>>>>> branchB<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M4.5 12.75l6 6 9-13.5\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M16.5 8.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v8.25A2.25 2.25 0 006 16.5h2.25m8.25-8.25H18a2.25 2.25 0 012.25 2.25V18A2.25 2.25 0 0118 20.25h-7.5A2.25 2.25 0 018.25 18v-1.5m8.25-8.25h-6a2.25 2.25 0 00-2.25 2.25v6\"><\/path><\/svg><\/span><pre class=\"shiki material-theme\" style=\"background-color: #263238\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #EEFFFF\">&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">sample1<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">=======<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">sample2<\/span><\/span>\n<span class=\"line\"><span style=\"color: #EEFFFF\">&gt;&gt;&gt;&gt;&gt;&gt;&gt; branchB<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\u66f4\u65b0\u5185\u5bb9\u3092\u78ba\u8a8d\u3057\u305f\u3089\u3001\u6700\u7d42\u7684\u306b\u30b3\u30df\u30c3\u30c8\u3057\u305f\u3044\u90e8\u5206\u306e\u307f\u3092\u6b8b\u3057\u3066\u3001\u305d\u306e\u4ed6\u306e\u8a18\u8ff0\u306f\u524a\u9664\u3057\u3066\u304a\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro\" data-code-block-pro-font-family=\"Code-Pro-JetBrains-Mono-NL.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-JetBrains-Mono-NL,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 10px 16px;margin-bottom:-2px;width:100%;text-align:left;background-color:#304047;color:#d5ffff\">\u4f8b<\/span><span role=\"button\" tabindex=\"0\" style=\"color:#EEFFFF;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>sample2<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M4.5 12.75l6 6 9-13.5\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M16.5 8.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v8.25A2.25 2.25 0 006 16.5h2.25m8.25-8.25H18a2.25 2.25 0 012.25 2.25V18A2.25 2.25 0 0118 20.25h-7.5A2.25 2.25 0 018.25 18v-1.5m8.25-8.25h-6a2.25 2.25 0 00-2.25 2.25v6\"><\/path><\/svg><\/span><pre class=\"shiki material-theme\" style=\"background-color: #263238\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #EEFFFF\">sample2<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\u7de8\u96c6\u304c\u5b8c\u4e86\u3057\u3001\u5168\u3066\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u89e3\u6d88\u3067\u304d\u305f\u3089\u3001\u8a72\u5f53\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u30b3\u30df\u30c3\u30c8\u3057\u307e\u3059\u3002<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro\" data-code-block-pro-font-family=\"Code-Pro-JetBrains-Mono-NL.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-JetBrains-Mono-NL,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 10px 16px;margin-bottom:-2px;width:100%;text-align:left;background-color:#304047;color:#d5ffff\">Bash<\/span><span role=\"button\" tabindex=\"0\" style=\"color:#EEFFFF;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly># \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u306b\u8ffd\u52a0\ngit add sample.txt\n\n# \u4fee\u6b63\u5185\u5bb9\u3092\u30b3\u30df\u30c3\u30c8\ngit commit<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M4.5 12.75l6 6 9-13.5\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M16.5 8.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v8.25A2.25 2.25 0 006 16.5h2.25m8.25-8.25H18a2.25 2.25 0 012.25 2.25V18A2.25 2.25 0 0118 20.25h-7.5A2.25 2.25 0 018.25 18v-1.5m8.25-8.25h-6a2.25 2.25 0 00-2.25 2.25v6\"><\/path><\/svg><\/span><pre class=\"shiki material-theme\" style=\"background-color: #263238\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #546E7A; font-style: italic\"># \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u306b\u8ffd\u52a0<\/span><\/span>\n<span class=\"line\"><span style=\"color: #FFCB6B\">git<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">add<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">sample.txt<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #546E7A; font-style: italic\"># \u4fee\u6b63\u5185\u5bb9\u3092\u30b3\u30df\u30c3\u30c8<\/span><\/span>\n<span class=\"line\"><span style=\"color: #FFCB6B\">git<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">commit<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\u3053\u3053\u307e\u3067\u304c\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u304d\u305f\u5834\u5408\u306e\u4e00\u9023\u306e\u6d41\u308c\u3068\u306a\u308a\u307e\u3059\u3002<\/p>\n\n\n\n<h2 id=\"outline__5\" class=\"wp-block-heading\">\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u5bfe\u8c61\u306e\u7247\u65b9\u3092\u7834\u68c4\u3057\u3066\u89e3\u6d88\u3059\u308b<\/h2>\n\n\n\n<p>\u3069\u3061\u3089\u304b\u7247\u65b9\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5185\u5bb9\u306e\u307f\u3092\u512a\u5148\u3057\u3066\u53d6\u308a\u8fbc\u3080\u5834\u5408\u306b\u6d3b\u7528\u3067\u304d\u308b\u306e\u304c\u3001git checkout\u30b3\u30de\u30f3\u30c9\u306e \u300c&#8211;ours\u300d \u30aa\u30d7\u30b7\u30e7\u30f3\u3068 \u300c&#8211;theirs\u300d \u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u3059\u3002<br>\u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u5074\u306e\u5185\u5bb9\u3092\u512a\u5148\u3059\u308b\u5834\u5408\u306f &#8211;ours \u30aa\u30d7\u30b7\u30e7\u30f3\u3001\u53d6\u308a\u8fbc\u307f\u5143\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u512a\u5148\u3059\u308b\u5834\u5408\u306f &#8211;theirs \u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u3066\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro\" data-code-block-pro-font-family=\"Code-Pro-JetBrains-Mono-NL.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-JetBrains-Mono-NL,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 10px 16px;margin-bottom:-2px;width:100%;text-align:left;background-color:#304047;color:#d5ffff\">Bash<\/span><span role=\"button\" tabindex=\"0\" style=\"color:#EEFFFF;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly># \u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u3092\u512a\u5148\ngit checkout --ours &#91;\u30d5\u30a1\u30a4\u30eb\u540d&#93;\n\n# \u53d6\u308a\u8fbc\u307f\u5143\u30d6\u30e9\u30f3\u30c1\u3092\u512a\u5148\ngit checkout --theirs &#91;\u30d5\u30a1\u30a4\u30eb\u540d&#93;<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M4.5 12.75l6 6 9-13.5\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M16.5 8.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v8.25A2.25 2.25 0 006 16.5h2.25m8.25-8.25H18a2.25 2.25 0 012.25 2.25V18A2.25 2.25 0 0118 20.25h-7.5A2.25 2.25 0 018.25 18v-1.5m8.25-8.25h-6a2.25 2.25 0 00-2.25 2.25v6\"><\/path><\/svg><\/span><pre class=\"shiki material-theme\" style=\"background-color: #263238\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #546E7A; font-style: italic\"># \u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u3092\u512a\u5148<\/span><\/span>\n<span class=\"line\"><span style=\"color: #FFCB6B\">git<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">checkout<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">--ours<\/span><span style=\"color: #EEFFFF\"> &#91;\u30d5\u30a1\u30a4\u30eb\u540d&#93;<\/span><\/span>\n<span class=\"line\"><\/span>\n<span class=\"line\"><span style=\"color: #546E7A; font-style: italic\"># \u53d6\u308a\u8fbc\u307f\u5143\u30d6\u30e9\u30f3\u30c1\u3092\u512a\u5148<\/span><\/span>\n<span class=\"line\"><span style=\"color: #FFCB6B\">git<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">checkout<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">--theirs<\/span><span style=\"color: #EEFFFF\"> &#91;\u30d5\u30a1\u30a4\u30eb\u540d&#93;<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u306b\u3088\u308a\u3001\u6307\u5b9a\u3057\u305f\u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u5185\u5bb9\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u81ea\u52d5\u3067\u89e3\u6d88\u3057\u3066\u304f\u308c\u307e\u3059\u3002<br>\u8907\u6570\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u307e\u3068\u3081\u3066\u89e3\u6d88\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u30b9\u30da\u30fc\u30b9\u3092\u7a7a\u3051\u3066\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u7d9a\u3051\u3066\u8a18\u8ff0\u3057\u307e\u3059\u3002<\/p>\n\n\n\n<p>\u4e21\u65b9\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5185\u5bb9\u3092\u63a1\u7528\u3057\u305f\u3044\u5834\u5408\u306f\u624b\u52d5\u3067\u89e3\u6d88\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u305f\u3081\u3001\u4f7f\u7528\u3067\u304d\u308b\u5834\u9762\u306f\u3042\u308b\u7a0b\u5ea6\u9650\u3089\u308c\u3066\u3057\u307e\u3044\u307e\u3059\u304c\u3001\u899a\u3048\u3066\u304a\u304f\u3068\u4fbf\u5229\u306a\u65b9\u6cd5\u3067\u3059\u3002<\/p>\n\n\n\n<h2 id=\"outline__6\" class=\"wp-block-heading\">fast-forward\u3068no-fast-forward<\/h2>\n\n\n\n<p>\u57fa\u672c\u7684\u306b\u3001git merge \u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068\u3001\u30de\u30fc\u30b8\u304c\u884c\u308f\u308c\u305f\u3053\u3068\u3092\u793a\u3059\u65b0\u305f\u306a\u30b3\u30df\u30c3\u30c8\u304c\u4f5c\u6210\u3055\u308c\u307e\u3059\u3002<br>\u5c65\u6b74\u306b\u3059\u308b\u3068\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u72b6\u614b\u3067\u3059\u3002<\/p>\n\n\n\n<img decoding=\"async\" class=\"post-img\" src=\"https:\/\/web-img.rensa.jp.net\/images\/techmania\/thumbnail\/images\/git_merge1.webp\" loading=\"lazy\">\n\n\n\n<p>\u3068\u3053\u308d\u304c\u3001\u30b1\u30fc\u30b9\u306b\u3088\u3063\u3066\u306f\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u4f5c\u6210\u3055\u308c\u305a\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u4e00\u76f4\u7dda\u306e\u5c65\u6b74\u3068\u3057\u3066\u307e\u3068\u3081\u3089\u308c\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n\n\n\n<p><strong>\u3010\u30de\u30fc\u30b8\u524d\u3011<\/strong><\/p>\n\n\n\n<img decoding=\"async\" class=\"post-img\" src=\"https:\/\/web-img.rensa.jp.net\/images\/techmania\/thumbnail\/images\/git_merge2.webp\" loading=\"lazy\">\n\n\n\n<p><strong>\u3010\u30de\u30fc\u30b8\u5f8c\u3011<\/strong><\/p>\n\n\n\n<img decoding=\"async\" class=\"post-img\" src=\"https:\/\/web-img.rensa.jp.net\/images\/techmania\/thumbnail\/images\/git_merge3.webp\" loading=\"lazy\">\n\n\n\n<p>\u3053\u306e\u3088\u3046\u306a\u30b1\u30fc\u30b9\u3092\u3001Fast-forward\u30de\u30fc\u30b8\u3068\u8a00\u3044\u307e\u3059\u3002<br>\u5206\u5c90\u70b9\u3088\u308a\u5f8c\u306b\u4f5c\u6210\u3055\u308c\u305f\u30b3\u30df\u30c3\u30c8\u304c\u3001\u53d6\u308a\u8fbc\u307f\u5148\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u5b58\u5728\u3057\u306a\u3044\u5834\u5408\u306b\u767a\u751f\u3059\u308b\u30de\u30fc\u30b8\u3067\u3059\u3002<\/p>\n\n\n\n<h3 id=\"outline__6_1\" class=\"wp-block-heading\">-no-ff\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u308b<\/h3>\n\n\n\n<p>\u4e0a\u8ff0\u3057\u305f\u3088\u3046\u306b\u3001Fast-forward\u30de\u30fc\u30b8\u306e\u5834\u5408\u306f\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u4f5c\u6210\u3055\u308c\u306a\u3044\u306e\u304c\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u3059\u304c\u3001\u30b1\u30fc\u30b9\u306b\u3088\u3063\u3066\u306f\u30b3\u30df\u30c3\u30c8\u8a18\u9332\u3092\u660e\u793a\u7684\u306b\u6b8b\u3057\u305f\u3044\u5834\u5408\u3082\u3042\u308b\u3068\u601d\u3044\u307e\u3059\u3002<br>\u305d\u306e\u969b\u306b\u4f7f\u7528\u3059\u308b\u306e\u304c\u3001\u300c&#8211;no-ff\u300d \u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u3059\u3002<\/p>\n\n\n\n<div class=\"wp-block-kevinbatdorf-code-block-pro\" data-code-block-pro-font-family=\"Code-Pro-JetBrains-Mono-NL.ttf\" style=\"font-size:clamp(14px, .875rem, 21px);font-family:Code-Pro-JetBrains-Mono-NL,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;line-height:clamp(20px, 1.25rem, 30px);--cbp-tab-width:2;tab-size:var(--cbp-tab-width, 2)\"><span style=\"display:flex;align-items:center;padding:10px 0px 10px 16px;margin-bottom:-2px;width:100%;text-align:left;background-color:#304047;color:#d5ffff\">Bash<\/span><span role=\"button\" tabindex=\"0\" style=\"color:#EEFFFF;display:none\" aria-label=\"Copy\" class=\"code-block-pro-copy-button\"><pre class=\"code-block-pro-copy-button-pre\" aria-hidden=\"true\"><textarea class=\"code-block-pro-copy-button-textarea\" tabindex=\"-1\" aria-hidden=\"true\" readonly>git merge --no-ff \u30d6\u30e9\u30f3\u30c1\u540d<\/textarea><\/pre><svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" style=\"width:24px;height:24px\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"2\"><path class=\"with-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M4.5 12.75l6 6 9-13.5\"><\/path><path class=\"without-check\" stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M16.5 8.25V6a2.25 2.25 0 00-2.25-2.25H6A2.25 2.25 0 003.75 6v8.25A2.25 2.25 0 006 16.5h2.25m8.25-8.25H18a2.25 2.25 0 012.25 2.25V18A2.25 2.25 0 0118 20.25h-7.5A2.25 2.25 0 018.25 18v-1.5m8.25-8.25h-6a2.25 2.25 0 00-2.25 2.25v6\"><\/path><\/svg><\/span><pre class=\"shiki material-theme\" style=\"background-color: #263238\" tabindex=\"0\"><code><span class=\"line\"><span style=\"color: #FFCB6B\">git<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">merge<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">--no-ff<\/span><span style=\"color: #EEFFFF\"> <\/span><span style=\"color: #C3E88D\">\u30d6\u30e9\u30f3\u30c1\u540d<\/span><\/span><\/code><\/pre><\/div>\n\n\n\n<p>&#8211;no-ff \u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u3066\u5b9f\u884c\u3059\u308b\u3053\u3068\u306b\u3088\u308a\u3001Fast-forward\u30de\u30fc\u30b8\u306e\u5834\u5408\u3067\u3082\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<br>\u958b\u767a\u73fe\u5834\u306e\u904b\u7528\u30eb\u30fc\u30eb\u306a\u3069\u3067\u8a18\u9332\u3092\u6b8b\u3059\u5fc5\u8981\u304c\u3042\u308b\u5834\u5408\u306f\u3001\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u3066\u30de\u30fc\u30b8\u3059\u308b\u3088\u3046\u306b\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n\n<h2 id=\"outline__7\" class=\"wp-block-heading\">\u307e\u3068\u3081<\/h2>\n\n\n\n<p>\u3044\u304b\u304c\u3067\u3057\u305f\u304b\uff1f\u4eca\u56de\u306f\u3001git merge \u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3059\u308b\u65b9\u6cd5\u306b\u3064\u3044\u3066\u89e3\u8aac\u3057\u307e\u3057\u305f\u3002<\/p>\n\n\n\n<p>\u307e\u3060 Git\u3092\u4f7f\u3044\u6163\u308c\u3066\u3044\u306a\u3044\u3068\u3044\u3046\u65b9\u306f\u3001\u521d\u3081\u306e\u5185\u306f\u5c11\u3057\u3084\u3084\u3053\u3057\u304f\u611f\u3058\u3066\u3057\u307e\u3046\u4f5c\u696d\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u304c\u3001\u983b\u7e41\u306b\u4f7f\u7528\u3059\u308b\u30b3\u30de\u30f3\u30c9\u306a\u306e\u3067\u3057\u3063\u304b\u308a\u3068\u4f7f\u3044\u65b9\u3092\u7406\u89e3\u3057\u3066\u304a\u304f\u3088\u3046\u306b\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n\n\n\n<h2 id=\"outline__8\" class=\"wp-block-heading\">Git\u306e\u52c9\u5f37\u65b9\u6cd5\u306f\uff1f<\/h2>\n\n\n<p>\u66f8\u7c4d\u3084\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u3067\u5b66\u7fd2\u3059\u308b\u65b9\u6cd5\u304c\u3042\u308a\u307e\u3059\u3002\u6628\u4eca\u3067\u306f\u3001YouTube\u306a\u3069\u306e\u52d5\u753b\u30b5\u30a4\u30c8\u3084\u30a8\u30f3\u30b8\u30cb\u30a2\u306e\u30b3\u30df\u30e5\u30cb\u30c6\u30a3\u30b5\u30a4\u30c8\u306a\u3069\u3082\u5145\u5b9f\u3057\u3066\u3044\u3066\u591a\u304f\u306e\u60c5\u5831\u304c\u624b\u306b\u5165\u308a\u307e\u3059\u3002<br \/>\u305d\u3057\u3066\u3001\u3088\u308a\u52b9\u7387\u7684\u306b\u77e5\u8b58\u30fb\u30b9\u30ad\u30eb\u3092\u7fd2\u5f97\u3059\u308b\u306b\u306f\u3001\u77e5\u8b58\u3092\u3064\u3051\u306a\u304c\u3089\u5b9f\u969b\u306b\u624b\u3092\u52d5\u304b\u3057\u3066\u307f\u308b\u306a\u3069\u3001\u30a4\u30f3\u30d7\u30c3\u30c8\u3068\u30a2\u30a6\u30c8\u30d7\u30c3\u30c8\u3092\u7e70\u308a\u8fd4\u3057\u3066\u3044\u304f\u3053\u3068\u304c\u91cd\u8981\u3067\u3059\u3002\u7279\u306b\u72ec\u5b66\u306e\u5834\u5408\u306f\u3001\u6709\u8b58\u8005\u306b\u8cea\u554f\u304c\u3067\u304d\u305f\u308a\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3092\u3082\u3089\u3048\u308b\u3088\u3046\u306a\u74b0\u5883\u304c\u3042\u308b\u3068\u3001\u7406\u89e3\u5ea6\u304c\u6df1\u307e\u308b\u3067\u3057\u3087\u3046\u3002<\/p>\n<p>\u305f\u3060\u3001Git\u306b\u9650\u3089\u305a\u3001IT\u30b9\u30ad\u30eb\u3092\u8eab\u306b\u3064\u3051\u308b\u969b\u3001\u3069\u3046\u3057\u3066\u3082\u8ab2\u984c\u306b\u3076\u3064\u304b\u3063\u3066\u3057\u307e\u3046\u3053\u3068\u306f\u3042\u308a\u307e\u3059\u3088\u306d\u3002\u7279\u306b\u72ec\u5b66\u3060\u3068\u3001\u308f\u304b\u3089\u306a\u3044\u90e8\u5206\u3092\u30d7\u30ed\u306b\u8cea\u554f\u3067\u304d\u308b\u6a5f\u4f1a\u3092\u78ba\u4fdd\u3057\u306b\u304f\u304f\u3001\u30e2\u30c1\u30d9\u30fc\u30b7\u30e7\u30f3\u304c\u7d9a\u304d\u306b\u304f\u3044\u3068\u3044\u3046\u5074\u9762\u304c\u3042\u308a\u307e\u3059\u3002\u72ec\u5b66\u3067\u30e2\u30c1\u30d9\u30fc\u30b7\u30e7\u30f3\u3092\u7dad\u6301\u3059\u308b\u81ea\u4fe1\u304c\u306a\u3044\u4eba\u306b\u306f\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u30b9\u30af\u30fc\u30eb\u3068\u3044\u3046\u624b\u3082\u3042\u308a\u307e\u3059\u3002\u8cbb\u7528\u306f\u639b\u304b\u308a\u307e\u3059\u304c\u3001\u305d\u306e\u5206\u30b9\u30ad\u30eb\u3092\u8eab\u306b\u3064\u3051\u3084\u3059\u3044\u3067\u3059\u3002\u3057\u3063\u304b\u308a\u3068\u77e5\u8b58\u30fb\u30b9\u30ad\u30eb\u3092\u7fd2\u5f97\u3057\u3066\u5b9f\u8df5\u306b\u6d3b\u304b\u3057\u305f\u3044\u3068\u3044\u3046\u4eba\u306f\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u30b9\u30af\u30fc\u30eb\u304c\u304a\u3059\u3059\u3081\u3067\u3059\u3002<\/p>\n<p><span class=\"markerYellow\"><strong>\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u30b9\u30af\u30fc\u30eb\u306a\u3089\u30c6\u30c3\u30af\u30de\u30cb\u30a2\u304c\u304a\u3059\u3059\u3081\uff01<\/strong><\/span><\/p>\n\n\n<img decoding=\"async\" src=\"https:\/\/web-img.rensa.jp.net\/rensa\/images\/techmania\/thumbnail\/images\/yuudou.png\" class=\"post-img\" loading=\"lazy\" alt=\"\">\n\n\n<p>IT\u30b9\u30ad\u30eb\u9700\u8981\u306e\u9ad8\u307e\u308a\u3068\u3068\u3082\u306b\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u30b9\u30af\u30fc\u30eb\u3082\u5897\u3048\u307e\u3057\u305f\u3002\u3057\u304b\u3057\u3001\u3069\u306e\u30b9\u30af\u30fc\u30eb\u306b\u901a\u3046\u3079\u304d\u304b\u8ff7\u3063\u3066\u3057\u307e\u3046\u4eba\u3082\u3044\u308b\u3067\u3057\u3087\u3046\u3002\u305d\u3093\u306a\u65b9\u306b\u306f\u30c6\u30c3\u30af\u30de\u30cb\u30a2\u3092\u304a\u3059\u3059\u3081\u3057\u307e\u3059\uff01\u3053\u308c\u307e\u3067\u591a\u304f\u306eIT\u30a8\u30f3\u30b8\u30cb\u30a2\u3092\u80b2\u6210\u30fb\u8f29\u51fa\u3057\u3066\u304d\u305f\u30c6\u30c3\u30af\u30de\u30cb\u30a2\u3067\u3082\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u30b9\u30af\u30fc\u30eb\u3092\u958b\u8b1b\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\n<div class=\"bgBox\">\n<p><strong>\uff1c\u30c6\u30c3\u30af\u30de\u30cb\u30a2\u306e\u7279\u5fb4\uff1e<\/strong><br \/><strong>\u30fb\u305f\u3057\u304b\u306a\u80b2\u6210\u5b9f\u7e3e\u3068\u89aa\u8eab\u306a\u6559\u80b2\u3000\uff5e\u30bb\u30ab\u30f3\u30c9\u30ad\u30e3\u30ea\u30a2\u3092\u5168\u529b\u652f\u63f4\uff5e<\/strong><br \/><strong>\u30fb\u8b1b\u5e2b\u304c\u73fe\u5f79\u30a8\u30f3\u30b8\u30cb\u30a2\u3000\uff5e\u201c\u672c\u5f53\u201d\u306e\u958b\u767a\u30ce\u30a6\u30cf\u30a6\u3092\u76f4\u306b\u5b66\u3079\u308b\uff5e<\/strong><br \/><strong>\u30fb\u5c02\u5c5e\u8b1b\u5e2b\u304c\u5b66\u7fd2\u3092\u5fb9\u5e95\u30b5\u30dd\u30fc\u30c8\u3000\uff5e\u300c\u308f\u304b\u3089\u306a\u3044\u300d\u3092\u5fb9\u5e95\u89e3\u6c7a\uff5e<\/strong><br \/><strong>\u30fb\u5b9f\u52d9\u30d9\u30fc\u30b9\u3067\u30b9\u30ad\u30eb\u3092\u7fd2\u5f97\u3000\uff5e\u5b9f\u8df5\u7684\u306a\u51dd\u7e2e\u30ab\u30ea\u30ad\u30e5\u30e9\u30e0\uff5e<\/strong><\/p>\n<\/div>\n<p>\u3053\u306e\u3088\u3046\u306a\u7279\u5fb4\u3092\u6301\u3064\u30c6\u30c3\u30af\u30de\u30cb\u30a2\u306fIT\u30a8\u30f3\u30b8\u30cb\u30a2\u306e\u30b9\u30bf\u30fc\u30c8\u30e9\u30a4\u30f3\u3068\u3057\u3066\u6700\u9069\u3067\u3059\u3002<br \/>\u8a71\u3092\u805e\u304d\u305f\u3044\u30fb\u8a73\u3057\u304f\u77e5\u308a\u305f\u3044\u3068\u3044\u3046\u65b9\u306f<a href=\"https:\/\/techmania.jp\/lp\/2\" target=\"_blank\" rel=\"noopener\">\u3053\u3061\u3089<\/a>\u304b\u3089\u304a\u6c17\u8efd\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002<\/p>","protected":false},"excerpt":{"rendered":"git \u3092\u4f7f\u3063\u3066\u4f5c\u696d\u3092\u884c\u3046\u5834\u5408\u3001\u30d6\u30e9\u30f3\u30c1\u306e\u5185\u5bb9\u3092\uff11\u3064\u306b\u7d71\u5408\u3059\u308b\u5fc5\u8981\u304c\u51fa\u3066\u304f\u308b\u6642\u304c\u3042\u308a\u307e\u3059\u3002\u305d\u306e\u969b\u306b\u4f7f\u7528\u3059\u308b\u306e\u304c\u3001git merge \u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002 \u4eca\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001git merge \u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3059\u308b\u5177\u4f53\u7684\u306a\u65b9\u6cd5\u306b\u3064\u3044\u3066\u89e3\u8aac\u3057\u3066\u3044\u304d\u305f\u3044\u3068\u601d\u3044\u307e\u3059\u3002 git merge\u3068\u306f\uff1f git merge \u30b3\u30de\u30f3\u30c9\u306f\u3001\u7279\u5b9a\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u30b3\u30df\u30c3\u30c8\u3055\u308c\u305f\u66f4\u65b0\u5185\u5bb9\u3092\u5225\u306e\u30d6\u30e9\u30f3\u30c1\u3078\u3068\u53cd\u6620\u3059\u308b\u969b\u306b\u4f7f\u7528\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002 [&hellip;]","protected":false},"author":11,"featured_media":10306,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"fifu_image_url":"https:\/\/web-img.rensa.jp.net\/images\/techmania\/thumbnail\/images\/git-merge.webp","fifu_image_alt":"\u3010Git\u5165\u9580\u3011merge\u30b3\u30de\u30f3\u30c9\u3067\u7570\u306a\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u5185\u5bb9\u3092\u7d71\u5408\u3059\u308b","footnotes":""},"categories":[1],"tags":[],"class_list":["post-10304","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-uncategorized"],"_links":{"self":[{"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/posts\/10304","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/users\/11"}],"replies":[{"embeddable":true,"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/comments?post=10304"}],"version-history":[{"count":4,"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/posts\/10304\/revisions"}],"predecessor-version":[{"id":10309,"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/posts\/10304\/revisions\/10309"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/media\/10306"}],"wp:attachment":[{"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/media?parent=10304"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/categories?post=10304"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/techmania.jp\/blog\/wp-json\/wp\/v2\/tags?post=10304"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}