{"id":3639,"date":"2023-06-29T13:34:56","date_gmt":"2023-06-29T04:34:56","guid":{"rendered":"http:\/\/attacktube.com\/?p=3639"},"modified":"2023-06-29T15:20:46","modified_gmt":"2023-06-29T06:20:46","slug":"%e3%80%90git%e3%80%91conflict%e3%81%97%e3%81%9f%e3%81%a8%e3%81%8d%e3%81%ae%e4%bf%ae%e6%ad%a3","status":"publish","type":"post","link":"https:\/\/attacktube.com\/?p=3639","title":{"rendered":"\u3010Git\u3011conflict\u3057\u305f\u3068\u304d\u306e\u5bfe\u51e6"},"content":{"rendered":"\n<p>git\u3067conflict\u3057\u305f\u3089\u3001conflict\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u4fee\u6b63\u3059\u308b\u3002<br>\u6b21\u306bStaging area\u306b\u4fee\u6b63\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u4e0a\u3052\u305f\u5f8c\u306b\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3053\u3068\u3002<\/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>main\u30d6\u30e9\u30f3\u30c1\u3068conflict\u30d6\u30e9\u30f3\u30c1\u306e2\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u305d\u308c\u305e\u308c\u30d5\u30a1\u30a4\u30eb\u3092\u5909\u66f4\u3059\u308b\u3002<\/p>\n\n\n\n<pre><code>\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (conflict)\n$ git add README.md\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (conflict)\n$ git commit -m &quot;conflict-test&quot;\n[conflict 94856b0] conflict-test\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (conflict)\n$ git status\nOn branch conflict\nnothing to commit, working tree clean\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (conflict)\n$ git log --oneline\n94856b0 (HEAD -&gt; conflict) conflict-test\n2316fc2 (origin\/main, origin\/HEAD, main) 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\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (conflict)\n$ git checkout main\nSwitched to branch &#039;main&#039;\nYour branch is up to date with &#039;origin\/main&#039;.\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ cat README.md\n# git-practice\n\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306fGit\u52d5\u753b\u8b1b\u5ea7\u7528\u3067\u3059\uff0e\n\u5909\u66f4\ngithub\u4e0a\u3067\u66f4\u65b00629\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ git add  README.md\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ git commit -m &quot;update&quot;\n[main 0f9408b] update\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ git log\ncommit 0f9408b1bcdce0eaa5368e2b4a3947f71d3c78cd (HEAD -&gt; main)\nAuthor: \u3007\u3007\u3007\u3007 &lt;\u3007\u3007\u3007\u3007@gmail.com&gt;\nDate:   Thu Jun 29 13:56:16 2023 +0900\n\n    update\n<\/code><\/pre>\n\n\n\n<p>\u30d6\u30e9\u30f3\u30c1\u540c\u58eb\u306e\u300cgit diff\u300d\u3092\u898b\u308b\u3002<br>\u305d\u3057\u3066\u3001\u300cgit merge\u300d\u3059\u308b\u3068conflict\u306b\u306a\u308b\u3002<br>\u300cgit merge conflict\u300d\u3067\u3001\u6307\u5b9a\u3057\u305fconflict\u30d6\u30e9\u30f3\u30c1\u3092\u4eca\u3044\u308bmain\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\u3002<\/p>\n\n\n\n<pre><code>\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ git diff main conflict\ndiff --git a\/README.md b\/README.md\nindex fa9fa0e..9668644 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-github\u4e0a\u3067\u66f4\u65b00629(main\u30d6\u30e9\u30f3\u30c1\u3067\u5909\u66f4)\n+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 conflict\nAuto-merging README.md\nCONFLICT (content): Merge conflict in README.md\nAutomatic merge failed; fix conflicts and then commit the result.\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main|MERGING)\n$ ls -a\n.\/  ..\/  .git\/  README.md  delete_soon.txt  namechangee2.txt\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main|MERGING)\n$ git status\nOn branch main\nYour branch is ahead of &#039;origin\/main&#039; by 1 commit.\n  (use &quot;git push&quot; to publish your local commits)\n\nYou have unmerged paths.\n  (fix conflicts and run &quot;git commit&quot;)\n  (use &quot;git merge --abort&quot; to abort the merge)\n\nUnmerged paths:\n  (use &quot;git add &lt;file&gt;...&quot; to mark resolution)\n        both modified:   README.md\n\nno changes added to commit (use &quot;git add&quot; and\/or &quot;git commit -a&quot;)\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main|MERGING)\n$ git log\ncommit 0f9408b1bcdce0eaa5368e2b4a3947f71d3c78cd (HEAD -&gt; main)\nAuthor: \u3007\u3007\u3007\u3007 &lt;\u3007\u3007\u3007\u3007@gmail.com&gt;\nDate:   Thu Jun 29 13:56:16 2023 +0900\n\n    update\n<\/code><\/pre>\n\n\n\n<p>README.md\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3059\u308b\u3002<\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><a href=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-1.jpg\"><img data-recalc-dims=\"1\" loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"553\" src=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-1.jpg?resize=1024%2C553\" alt=\"\" class=\"wp-image-3653\" srcset=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-1.jpg?resize=1024%2C553&amp;ssl=1 1024w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-1.jpg?resize=300%2C162&amp;ssl=1 300w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-1.jpg?resize=768%2C415&amp;ssl=1 768w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-1.jpg?resize=1536%2C830&amp;ssl=1 1536w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-1.jpg?resize=304%2C164&amp;ssl=1 304w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-1.jpg?resize=282%2C152&amp;ssl=1 282w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-1.jpg?w=1914&amp;ssl=1 1914w\" sizes=\"auto, (max-width: 1000px) 100vw, 1000px\" \/><\/a><figcaption class=\"wp-element-caption\">conflict\u304c\u8d77\u304d\u305fREADME.md<\/figcaption><\/figure>\n\n\n\n<figure class=\"wp-block-image size-large\"><a href=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-2fix.jpg\"><img data-recalc-dims=\"1\" loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"554\" src=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-2fix.jpg?resize=1024%2C554\" alt=\"\" class=\"wp-image-3668\" srcset=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-2fix.jpg?resize=1024%2C554&amp;ssl=1 1024w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-2fix.jpg?resize=300%2C162&amp;ssl=1 300w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-2fix.jpg?resize=768%2C416&amp;ssl=1 768w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-2fix.jpg?resize=1536%2C831&amp;ssl=1 1536w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-2fix.jpg?resize=304%2C164&amp;ssl=1 304w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-2fix.jpg?resize=282%2C153&amp;ssl=1 282w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-2fix.jpg?w=1913&amp;ssl=1 1913w\" sizes=\"auto, (max-width: 1000px) 100vw, 1000px\" \/><\/a><figcaption class=\"wp-element-caption\">conflict\u3092\u4fee\u6b63\u3057\u305fREADME.md<\/figcaption><\/figure>\n\n\n\n<p>README.md\u3092\u4fee\u6b63\u5f8c\u306bstaging area\u306b\u4e0a\u3052\u3066\u3001\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3002<\/p>\n\n\n\n<pre><code>\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main|MERGING)\n$ git add README.md\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main|MERGING)\n$ git status\nOn branch main\nYour branch is ahead of &#039;origin\/main&#039; by 1 commit.\n  (use &quot;git push&quot; to publish your local commits)\n\nAll conflicts fixed but you are still merging.\n  (use &quot;git commit&quot; to conclude merge)\n\nChanges to be committed:\n        modified:   README.md\n\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main|MERGING)\n$ git commit -m &quot;resolve conflict&quot;\n[main 7675a82] resolve conflict\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ git status\nOn branch main\nYour branch is ahead of &#039;origin\/main&#039; by 3 commits.\n  (use &quot;git push&quot; to publish your local commits)\n\nnothing to commit, working tree clean\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ git log --oneline --graph\n*   7675a82 (HEAD -&gt; main) resolve conflict\n|\\\n| * 94856b0 (conflict) conflict-test\n* | 0f9408b update\n|\/\n* 2316fc2 (origin\/main, origin\/HEAD) Update README.md\n* 8b30521 (tag: v1.0.0, a) new file\n* 4f93311 delete file\n* 83ff903 make new file\n* 1a83ddd change name\n* 7fc4362 add newfile\n* b52de06 Initial commit\ndaiki@B-7-PC MINGW64 ~\/git-practice (main)\n$ cat README.md\n# git-practice\n\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306fGit\u52d5\u753b\u8b1b\u5ea7\u7528\u3067\u3059\uff0e\n\u5909\u66f4\nconflict\u306e\u5bfe\u51e6\u306e\u7df4\u7fd2github\u4e0a\u3067\u66f4\u65b00629(conflict\u3088\u308a)\n\ndaiki@B-7-PC MINGW64 ~\/git-practice (main)\n$\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (main)\n$ cat README.md\n# git-practice\n\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306fGit\u52d5\u753b\u8b1b\u5ea7\u7528\u3067\u3059\uff0e\n\u5909\u66f4\nconflict\u306e\u5bfe\u51e6\u306e\u7df4\u7fd2github\u4e0a\u3067\u66f4\u65b00629(conflict\u3088\u308a)\n\n<\/code><\/pre>\n\n\n\n<p>conflict\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3057\u3066log\u3092\u8868\u793a\u3057\u3066\u307f\u308b\u3002<\/p>\n\n\n\n<pre><code>\n\n\u25b3\u25b3\u25b3@B-7-PC MINGW64 ~\/git-practice (conflict)\n$ git log --oneline --graph\n* 94856b0 (HEAD -&gt; conflict) conflict-test\n* 2316fc2 (origin\/main, origin\/HEAD) Update README.md\n* 8b30521 (tag: v1.0.0, a) new file\n* 4f93311 delete file\n* 83ff903 make new file\n* 1a83ddd change name\n* 7fc4362 add newfile\n* b52de06 Initial commit\n\n<\/code><\/pre>\n\n\n\n<p>\u95a2\u9023<br><a href=\"http:\/\/attacktube.com\/?p=3629\">\u3010Git\u3011\u6307\u5b9a\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u3092\u4eca\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b (attacktube.com)<\/a><\/p>\n\n\n\n<script type=\"text\/javascript\">\njQuery(function($){\n$(\".jp-video\").hide();\n});\n<\/script>\n","protected":false},"excerpt":{"rendered":"<p>git\u3067conflict\u3057\u305f\u3089\u3001conflict\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u4fee\u6b63\u3059\u308b\u3002\u6b21\u306bStaging area\u306b\u4fee\u6b63\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u4e0a\u3052\u305f\u5f8c\u306b\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3053\u3068\u3002<\/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-3639","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\/3639","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=3639"}],"version-history":[{"count":21,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3639\/revisions"}],"predecessor-version":[{"id":3675,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3639\/revisions\/3675"}],"wp:attachment":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3639"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=3639"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=3639"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}