{"id":3677,"date":"2023-06-29T17:42:01","date_gmt":"2023-06-29T08:42:01","guid":{"rendered":"http:\/\/attacktube.com\/?p=3677"},"modified":"2023-06-29T20:59:46","modified_gmt":"2023-06-29T11:59:46","slug":"%e3%80%90git%e3%80%91automatic-merge","status":"publish","type":"post","link":"https:\/\/attacktube.com\/?p=3677","title":{"rendered":"\u3010Git\u3011Automatic merge"},"content":{"rendered":"\n<p class=\"wp-block-paragraph\">merge\u3059\u308b\u3068\u3001Fast forward\u307e\u305f\u306f\u3001Automatic merge\u307e\u305f\u306f\u3001Conflict\u306b\u306a\u308b\u3002<br>Automatic merge\u306b\u306a\u308b\u3068\u304d\u306f\u3069\u3093\u306a\u3068\u304d\u304b\uff1f<\/p>\n\n\n\n<!--more-->\n\n\n\n<br>\n<script async=\"\" src=\"https:\/\/pagead2.googlesyndication.com\/pagead\/js\/adsbygoogle.js?client=ca-pub-3461056110605997\" crossorigin=\"anonymous\"><\/script>\n<ins class=\"adsbygoogle\" style=\"display:block; text-align:center;\" data-ad-layout=\"in-article\" data-ad-format=\"fluid\" data-ad-client=\"ca-pub-3461056110605997\" data-ad-slot=\"3137443461\"><\/ins>\n<script>\n     (adsbygoogle = window.adsbygoogle || []).push({});\n<\/script>\n<br>\n\n\n\n<p class=\"wp-block-paragraph\">\u624b\u9806<br>1.\u30d6\u30e9\u30f3\u30c1no-fast-forward\u3067README.md\u3092\u5909\u66f4\u3059\u308b\u3002<br>2.\u30d6\u30e9\u30f3\u30c1main\u3067NEW_README.txt\u3092\u65b0\u898f\u4f5c\u6210\u3059\u308b\u3002<br>3.\u6307\u5b9a\u3057\u305f\u30d6\u30e9\u30f3\u30c1no-fast-forward\u3092\u4eca\u3044\u308b\u30d6\u30e9\u30f3\u30c1main\u306bmerge\u3059\u308b\u3002<br>   \u3053\u306e\u3068\u304d\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u3067vi\u30a8\u30c7\u30a3\u30bf\u304c\u958b\u3044\u3066\u3001\u300cMerge branch\uff5e\u300d\u3068\u51fa\u308b\u3002<br>   \u3053\u306evi\u30a8\u30c7\u30a3\u30bf\u304c\u51fa\u3066\u304d\u305f\u3001\u300c:wq\u300d(\u4fdd\u5b58\u7d42\u4e86 wite &amp; quit)\u3092\u3059\u308b\u3053\u3068\u3002<br>   \u3053\u306e\u300cMerge Branch\u300d\u304c\u51fa\u308b\u3068\u304d\u304cAutomatic merge\u3067\u3042\u308b\u3002<br>4.\u300cgit log\u300d\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068Merge Branch\u3068\u8868\u793a\u3055\u308c\u308b\u3053\u3068\u304c\u78ba\u8a8d\u3067\u304d\u308b\u3002<\/p>\n\n\n\n<pre><code>\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ git diff main no-fast-forward\ndiff --git a\/NEW_README.txt b\/NEW_README.txt\ndeleted file mode 100644\nindex dac350e..0000000\n--- a\/NEW_README.txt\n+++ \/dev\/null\n@@ -1 +0,0 @@\n-main test 20230629-1\n\\ No newline at end of file\ndiff --git a\/README.md b\/README.md\nindex 9668644..f787766 100644\n--- a\/README.md\n+++ b\/README.md\n@@ -1,4 +1,4 @@\n # git-practice\n \u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306fGit\u52d5\u753b\u8b1b\u5ea7\u7528\u3067\u3059\uff0e\n \u5909\u66f4\n-conflict\u306e\u5bfe\u51e6\u306e\u7df4\u7fd2github\u4e0a\u3067\u66f4\u65b00629(conflict\u3088\u308a)\n+no-fast-forward conflict\u306e\u5bfe\u51e6\u306e\u7df4\u7fd2github\u4e0a\u3067\u66f4\u65b00629(conflict\u3088\u308a)\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ git merge no-fast-forward\nMerge made by the 'ort' strategy.\n README.md | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ git log --oneline --all\n6f0111a (HEAD -> main) Merge branch 'no-fast-forward'\n332dcda make new README\nb68cf7b (no-fast-forward) update-README.MD\n7675a82 resolve conflict\n0f9408b update\n94856b0 (conflict) conflict-test\n2316fc2 (origin\/main, origin\/HEAD) Update README.md\n8b30521 (tag: v1.0.0, a) new file\n4f93311 delete file\n83ff903 make new file\n1a83ddd change name\n7fc4362 add newfile\nb52de06 Initial commit\n<\/code><\/pre>\n\n\n\n<script type=\"text\/javascript\">\njQuery(function($){\n$(\".jp-video\").hide();\n});\n<\/script>\n","protected":false},"excerpt":{"rendered":"<p>merge\u3059\u308b\u3068\u3001Fast forward\u307e\u305f\u306f\u3001Automatic merge\u307e\u305f\u306f\u3001Conflict\u306b\u306a\u308b\u3002Automatic merge\u306b\u306a\u308b\u3068\u304d\u306f\u3069\u3093\u306a\u3068\u304d\u304b\uff1f<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[12],"tags":[],"class_list":["post-3677","post","type-post","status-publish","format-standard","hentry","category-it"],"jetpack_featured_media_url":"","jetpack-related-posts":[],"jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3677","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=3677"}],"version-history":[{"count":3,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3677\/revisions"}],"predecessor-version":[{"id":3694,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3677\/revisions\/3694"}],"wp:attachment":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3677"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=3677"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=3677"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}