{"id":3707,"date":"2023-06-30T19:54:05","date_gmt":"2023-06-30T10:54:05","guid":{"rendered":"http:\/\/attacktube.com\/?p=3707"},"modified":"2023-06-30T20:23:25","modified_gmt":"2023-06-30T11:23:25","slug":"%e3%80%90git%e3%80%91%e3%83%ad%e3%83%bc%e3%82%ab%e3%83%ab%e3%83%aa%e3%83%9d%e3%82%b8%e3%83%88%e3%83%aa%e3%81%a8%e3%83%aa%e3%83%a2%e3%83%bc%e3%83%88%e3%83%aa%e3%83%9d%e3%82%b8%e3%83%88%e3%83%aa","status":"publish","type":"post","link":"https:\/\/attacktube.com\/?p=3707","title":{"rendered":"\u3010Git\u3011\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4e21\u65b9\u306b\u5b58\u5728\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u3092\u8868\u793a\u3059\u308b\u3010\u4e2d\u7d1a\u8005\u3011"},"content":{"rendered":"\n<p>\u3053\u306e\u8a18\u4e8b\u306e\u5185\u5bb9\u306f\u3001Git\u521d\u5fc3\u8005\u306f\u77e5\u3089\u306a\u304f\u3066\u3082\u3044\u3044\u5185\u5bb9\u3067\u3042\u308a\u3001\u4e2d\u7d1a\u8005\u4ee5\u4e0a\u306e\u65b9\u5411\u3051\u5185\u5bb9\u3068\u3059\u308b\u3002<br><br>\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4e21\u65b9\u306b\u5b58\u5728\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u3092\u8868\u793a\u3059\u308b\u3002<br><code>\u300c<\/code>-a\u300d\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u300call\u300d\u306e\u7565\u3067\u3042\u308a\u3001\u5168\u3066\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u8868\u793a\u3059\u308b\u3068\u3044\u3046\u610f\u5473\u3067\u3042\u308b\u3002<br>\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3067\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u3042\u308b\u30d6\u30e9\u30f3\u30c1\u3092\u8868\u793a\u3057\u3066\u3069\u3046\u3059\u308b\u3093\u3060\uff1f\u4f55\u306b\u4f7f\u3046\u306e\u3060\u308d\u3046\u304b\uff1f<br>\u3088\u304f\u5206\u304b\u3089\u306a\u3044\u3002\u5206\u304b\u3063\u3066\u3044\u308b\u4e8b\u306f\u3001Git\u521d\u5fc3\u8005\u306f\u77e5\u308b\u5fc5\u8981\u304c\u306a\u3044\u30b3\u30de\u30f3\u30c9\u3060\u306a\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<pre><code>\n\u3007\u3007\u3007\u3007@B-7-PC MINGW64 ~\/git-practice (no-fast-forward)\n$ git branch -a\n  a\n  conflict\n  main\n* no-fast-forward\n  remotes\/origin\/HEAD -&gt; origin\/main\n  remotes\/origin\/main\n<\/code><\/pre>\n\n\n\n<p>remotes\/origin\/HEAD -&gt; origin\/main\u306f\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u30d6\u30e9\u30f3\u30c1(\u901a\u5e38\u306fmain\u307e\u305f\u306f master)\u3092\u6307\u3057\u3066\u3044\u308b\u3002<br>remotes\/origin\/HEAD -&gt; origin\/main \u306f\u30ea\u30e2\u30fc\u30c8\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u30d6\u30e9\u30f3\u30c1\u3067\u306f\u306a\u3044\u3002<\/p>\n\n\n\n<p>remotes\/origin\/main \u306f\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e main \u30d6\u30e9\u30f3\u30c1\u3092\u30ed\u30fc\u30ab\u30eb\u3067\u8ffd\u8de1\u3057\u3066\u3044\u308b\u30ea\u30e2\u30fc\u30c8\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u30d6\u30e9\u30f3\u30c1\u3067\u3042\u308b\u3002<br><br>remotes\/origin\/HEAD \u306e\u30d1\u30b9\u306f .git\/refs\/remotes\/origin\/HEAD \u3067\u3042\u308b\u3002<br>origin\/main \u306e\u30d1\u30b9\u306f .git\/refs\/remotes\/origin\/main \u3067\u3042\u308b\u3002<br>remotes\/origin\/main \u306e\u30d1\u30b9\u306f .git\/refs\/remotes\/origin\/main \u3067\u3042\u308b\u3002<br>\u305d\u308c\u305e\u308c\u306e\u30d1\u30b9\u306f\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u306e .git \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306e refs\/remotes\/origin \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u5b58\u5728\u3059\u308b\u3002<\/p>\n\n\n\n<script type=\"text\/javascript\">\njQuery(function($){\n$(\".jp-video\").hide();\n});\n<\/script>\n","protected":false},"excerpt":{"rendered":"<p>\u3053\u306e\u8a18\u4e8b\u306e\u5185\u5bb9\u306f\u3001Git\u521d\u5fc3\u8005\u306f\u77e5\u3089\u306a\u304f\u3066\u3082\u3044\u3044\u5185\u5bb9\u3067\u3042\u308a\u3001\u4e2d\u7d1a\u8005\u4ee5\u4e0a\u306e\u65b9\u5411\u3051\u5185\u5bb9\u3068\u3059\u308b\u3002 \u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4e21\u65b9\u306b\u5b58\u5728\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u3092\u8868\u793a\u3059\u308b\u3002\u300c-a\u300d\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u300call\u300d\u306e\u7565\u3067\u3042\u308a\u3001\u5168\u3066\u306e\u30d6\u30e9\u30f3 [&hellip;]<\/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-3707","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\/3707","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=3707"}],"version-history":[{"count":4,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3707\/revisions"}],"predecessor-version":[{"id":3712,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3707\/revisions\/3712"}],"wp:attachment":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3707"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=3707"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=3707"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}