{"id":3192,"date":"2023-06-26T12:32:55","date_gmt":"2023-06-26T03:32:55","guid":{"rendered":"http:\/\/attacktube.com\/?p=3192"},"modified":"2023-11-03T19:30:42","modified_gmt":"2023-11-03T10:30:42","slug":"%e3%80%90git%e3%80%91merge-branch%e3%80%90%e4%b8%8d%e6%98%8e%e7%82%b9%e3%80%91","status":"publish","type":"post","link":"https:\/\/attacktube.com\/?p=3192","title":{"rendered":"\u3010Git\u3011Merge branch\u3010\u539f\u56e0\u3011"},"content":{"rendered":"\n<p>2023\u5e746\u670826\u65e5(\u6708)\u306e\u6642\u70b9<br>git\u3067\u3088\u304f\u5206\u304b\u3063\u3066\u3044\u306a\u3044\u3068\u3053\u308d\u3092\u66f8\u3044\u3066\u304a\u304f\u3002<br>git pull\u3057\u305f\u3068\u304d\u306b\u3001\u6b21\u306evi\u30a8\u30c7\u30a3\u30bf\u304c\u8d77\u52d5\u3059\u308b\u3002<br>vi\u30a8\u30c7\u30a3\u30bf\u304c\u8d77\u52d5\u3057\u305f\u3068\u304d\u3001Merge branch\u3068\u51fa\u3066\u304d\u305f\u3002<\/p>\n\n\n\n<!--more-->\n\n\n\n<pre><code>\nMerge branch 'main' of github.com:reiwa-info-fin-corp\/localtime into update\n# Please enter a commit message to explain why this merge is necessary,\n# especially if it merges an updated upstream into a topic branch.\n#\n# Lines starting with '#' will be ignored, and an empty message aborts\n# the commit.\n<\/code><\/pre>\n\n\n\n<p>\u4e0d\u660e\u70b9<br>\u3053\u306evi\u30a8\u30c7\u30a3\u30bf\u306f\u3069\u3093\u306a\u3068\u304d\u306b\u51fa\u3066\u6765\u308b\uff1f\u3053\u306evi\u30a8\u30c7\u30a3\u30bf\u3092\u51fa\u305d\u3046\u3057\u305f\u304c\u518d\u73fe\u3067\u304d\u306a\u3044\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><br>Merge branch\u304c\u3088\u304f\u5206\u304b\u3063\u3066\u3044\u306a\u3044\u3002<br><br>\u3007\u8ffd\u8a1820231103<br>\u3084\u3063\u3068Merge branch\u51fa\u308b\u6761\u4ef6\u304c\u5206\u304b\u3063\u305f\u3002<br>main\u30d6\u30e9\u30f3\u30c1\u3068main\u30d6\u30e9\u30f3\u30c1\u4ee5\u5916\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u3042\u308a\u3001main\u30d6\u30e9\u30f3\u30c1\u3067\u30b3\u30df\u30c3\u30c8\u3057\u305f\u5f8c\u306b\u300cgit push origin \u3010main\u30d6\u30e9\u30f3\u30c1\u4ee5\u5916\u306e\u30d6\u30e9\u30f3\u30c1\u3011\u300d\u3059\u308b\u524d\u306b\u300cgit pull origin main\u300d\u3092\u3059\u308b\u3068\u300cMerge branch\u300d\u3068\u306a\u308b\u3088\u3046\u3060\u3002github\u4e0a\u306e\u3010main\u3011\u3068\u81ea\u5206\u306ePC\u306e\u3010main\u30d6\u30e9\u30f3\u30c1\u4ee5\u5916\u306e\u30d6\u30e9\u30f3\u30c1\u3011\u304cmerge\u3055\u308c\u308b\u3068\u3044\u3046\u3053\u3068\u3060\u306a\u3002<br><br>git log\u306f\u6b21\u306e\u3088\u3046\u306a\u30e1\u30c3\u30bb\u30fc\u30b8\u306b\u306a\u308b\u3002\u300cMerge branch\u300d\u3068\u66f8\u3044\u3066\u3042\u308b\u3002<\/p>\n\n\n\n<pre><code>\ncommit 5c2e36851594d4946a431e3227cc82ad95596597\nMerge: 4a90a16 f4ceeae\nAuthor: reiwa-info-fin-corp &lt;reiwa.info.fin.corp@gmail.com&gt;\nDate:   Sun Jun 25 16:55:25 2023 +0900\n\n    Merge branch &#039;main&#039; of github.com:reiwa-info-fin-corp\/localtime into update\n\n<\/code><\/pre>\n\n\n\n<p>\u300cShowing 0 changed files with 0 additions and 0 deletions.\u300d\u3068github\u306b\u51fa\u3066\u3044\u308b\u306a\u3002<br>\u3084\u306f\u308a\u3001\u5909\u66f4\u304c\u306a\u3044\u306b\u3082\u304b\u304b\u308f\u3089\u305a\u3001Merge branch\u3068git log\u306b\u51fa\u308b\u306e\u304b\uff1f\u3088\u304f\u5206\u304b\u3089\u306a\u3044\u306a\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\/0626-1.jpg\"><img data-recalc-dims=\"1\" loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"389\" src=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/0626-1.jpg?resize=1024%2C389\" alt=\"\" class=\"wp-image-3462\" srcset=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/0626-1.jpg?resize=1024%2C389&amp;ssl=1 1024w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/0626-1.jpg?resize=300%2C114&amp;ssl=1 300w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/0626-1.jpg?resize=768%2C292&amp;ssl=1 768w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/0626-1.jpg?resize=1536%2C584&amp;ssl=1 1536w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/0626-1.jpg?resize=304%2C115&amp;ssl=1 304w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/0626-1.jpg?resize=282%2C107&amp;ssl=1 282w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/0626-1.jpg?w=1861&amp;ssl=1 1861w\" sizes=\"auto, (max-width: 1000px) 100vw, 1000px\" \/><\/a><\/figure>\n\n\n\n<p><a href=\"https:\/\/github.com\/reiwa-info-fin-corp\/localtime\/commit\/5c2e36851594d4946a431e3227cc82ad95596597\">Merge branch &#8216;main&#8217; of github.com:reiwa-info-fin-corp\/localtime into \u2026 \u00b7 reiwa-info-fin-corp\/localtime@5c2e368 \u00b7 GitHub<\/a> ExternalLink<\/p>\n\n\n\n<p>git pull\u3057\u305f\u3068\u304d\u306b\u300cMerge made by the &#8216;ort&#8217; strategy.\u300d\u3068\u306a\u308b\u3068\u3001\u300cgit log\u300d\u306b\u300cMerge branch\u300d\u3068\u51fa\u308b\u307f\u305f\u3044\u3060\u306a\u3002<br>\u300cMerge made by the &#8216;ort&#8217; strategy.\u300d\u306f\u3001\u300c&#8217;ort&#8217;\u6226\u7565\u306b\u3088\u3063\u3066\u30de\u30fc\u30b8\u304c\u884c\u308f\u308c\u307e\u3057\u305f\u3002\u300d\u3068\u3044\u3046\u610f\u5473\u3067\u3042\u308b\u3002\u3002\u300cort\u300d\u306f\u7279\u5b9a\u306e\u30de\u30fc\u30b8\u6226\u7565\u306e\u540d\u524d\u3089\u3057\u3044\u3002\u3053\u306e\u8fba\u306f\u3088\u304f\u5206\u304b\u3089\u306a\u3044\u3002<br>\u3068\u308a\u3042\u3048\u305a\u3001\u3053\u306e\u3088\u3046\u306a\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u51fa\u308b\u3068\u899a\u3048\u3066\u304a\u304f\u3002<\/p>\n\n\n\n<pre><code>\n\u3007\u3007\u3007@B-7-PC MINGW64 ~\/localtime (update)\n$ git pull origin main\nFrom github.com:\u25b3\u25b3\u25b3\/localtime\n * branch            main       -&gt; FETCH_HEAD\nMerge made by the &#039;ort&#039; strategy.\n\n\u3007\u3007\u3007@B-7-PC MINGW64 ~\/localtime (update)\n$ git log\ncommit 5c2e36851594d4946a431e3227cc82ad95596597 (HEAD -&gt; update)\nMerge: 4a90a16 f4ceeae\nAuthor: \u25b3\u25b3\u25b3 &lt;\uff5e@gmail.com&gt;\nDate:   Sun Jun 25 16:55:25 2023 +0900\n\n    Merge branch &#039;main&#039; of github.com:\u25b3\u25b3\u25b3\/localtime into update\n<\/code><\/pre>\n\n\n\n<p>Merge branch\u304c\u51fa\u308b\u539f\u56e0\u3092\u89e3\u660e\u3059\u308b\u3002<br>\u30b3\u30df\u30c3\u30c8ID(5c2e368)\u306e\u89aa\u30b3\u30df\u30c3\u30c8ID\u306f\u30b3\u30df\u30c3\u30c8ID(4a90a16)\u3067\u3042\u308b\u3002<br>\u30b3\u30df\u30c3\u30c8ID(f4ceeae)\u3068\u30b3\u30df\u30c3\u30c8ID(4a90a16)\u304c\u30de\u30fc\u30b8\u3055\u308c\u308b\u3002<br>\u7d50\u679c\u3068\u3057\u3066\u30b3\u30df\u30c3\u30c8ID(5c2e368)\u306eMerge branch\u306b\u306a\u3063\u3066\u3044\u308b\u3002<br>\u30b3\u30df\u30c3\u30c8ID(4a90a16)\u306e\u89aa\u30b3\u30df\u30c3\u30c8ID\u304c\u30b3\u30df\u30c3\u30c8ID(f4ceeae)\u3060\u3063\u305f\u306a\u3089\u3070\u3001Merge branch\u306b\u306a\u3089\u306a\u304b\u3063\u305f\u3068\u8003\u3048\u3089\u308c\u308b\u3002<\/p>\n\n\n\n<pre><code>\n\u3007\u3007\u3007@B-7-PC MINGW64 ~\/localtime (main)\n$ git log --graph --oneline\n*   8002dac (HEAD -&gt; main, tag: v1.0.11, origin\/main, origin\/HEAD) Merge pull request #12 from \u25b3\u25b3\u25b3\/update\n|\\\n| * 60ecb1a (origin\/update) [update README.md]\n| * 525ee17 [update:package.json,README.md]\n|\/\n*   26a4b73 (tag: v1.0.10) Merge pull request #11 from \u25b3\u25b3\u25b3\/update\n|\\\n| * 6490df8 [update:package.json,README.md]\n|\/\n*   a9fad4e (tag: v1.0.9) Merge pull request #10 from \u25b3\u25b3\u25b3\/update\n|\\\n| * 05d27d0 [update:package.json]\n| * c734531 [update:LocalTime.js]\n|\/\n*   dc5bc1a (tag: v1.0.8) Merge pull request #9 from \u25b3\u25b3\u25b3\/update\n|\\\n| * c9cf0f8 [update:package.json]\n| * eb5adf8 [update:README.md,LocalTime.js]\n|\/\n*   4e11711 (tag: v1.0.7) Merge pull request #8 from \u25b3\u25b3\u25b3\/update\n|\\\n| * b700ae7 [update README.md]\n| * 2d048e3 [update README.md,package.json]\n|\/\n*   c06bfb7 (tag: v1.0.6) Merge pull request #7 from \u25b3\u25b3\u25b3\/update\n|\\\n| * 1c2f9bf [update README.md]\n| * 0487838 [update README.md,package.json]\n|\/\n*   5c996e1 (tag: v1.0.5) Merge pull request #6 from \u25b3\u25b3\u25b3\/update\n|\\\n| * 4bad8bc [update README.md]\n| * 423cd12 [update README.md,package.json]\n|\/\n*   72936d8 (tag: v1.0.4) Merge pull request #5 from \u25b3\u25b3\u25b3\/update\n|\\\n| * 28efad7 [update:package.json]\n| *   5c2e368 Merge branch &#039;main&#039; of github.com:\u25b3\u25b3\u25b3\/localtime into update\n| |\\\n| |\/\n|\/|\n* |   f4ceeae (tag: v1.0.3) Merge pull request #4 from \u25b3\u25b3\u25b3\/update\n|\\ \\\n| | * 4a90a16 [update:.gitattributes,LocalTime.js,LocalTime_sample.js,README.md,package.json]\n| |\/\n| * 1f56055 [update README.md,LocalTime.js,package.json]\n|\/\n*   671e93f (tag: v1.0.2) Merge pull request #3 from \u25b3\u25b3\u25b3\/update\n|\\\n| * 1ba536f [update README.md,package.json]\n|\/\n*   9952025 (tag: v1.0.1) Merge pull request #2 from \u25b3\u25b3\u25b3\/update\n|\\\n| * 6c0badc [update README.md,LocalTime_sample.js,package.json]\n|\/\n*   266c76f (tag: v1.0.0) Merge pull request #1 from \u25b3\u25b3\u25b3\/update\n|\\\n| * ef2c982 [update README.md],[add LocalTime.js,LocalTime_sample.js,package.json,.gitattributes]\n|\/\n* 0916720 Initial commit\n<\/code><\/pre>\n\n\n\n<figure class=\"wp-block-image size-full\"><a href=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-3fix2.jpg\"><img data-recalc-dims=\"1\" loading=\"lazy\" decoding=\"async\" width=\"382\" height=\"1001\" src=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-3fix2.jpg?resize=382%2C1001\" alt=\"\" class=\"wp-image-3701\" srcset=\"https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-3fix2.jpg?w=382&amp;ssl=1 382w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-3fix2.jpg?resize=114%2C300&amp;ssl=1 114w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-3fix2.jpg?resize=82%2C214&amp;ssl=1 82w, https:\/\/i0.wp.com\/attacktube.com\/wp-content\/uploads\/2023\/06\/20230629-3fix2.jpg?resize=99%2C260&amp;ssl=1 99w\" sizes=\"auto, (max-width: 382px) 100vw, 382px\" \/><\/a><\/figure>\n\n\n\n<script type=\"text\/javascript\">\njQuery(function($){;\n$(\".jp-video\").hide();\n});\n<\/script>\n","protected":false},"excerpt":{"rendered":"<p>2023\u5e746\u670826\u65e5(\u6708)\u306e\u6642\u70b9git\u3067\u3088\u304f\u5206\u304b\u3063\u3066\u3044\u306a\u3044\u3068\u3053\u308d\u3092\u66f8\u3044\u3066\u304a\u304f\u3002git pull\u3057\u305f\u3068\u304d\u306b\u3001\u6b21\u306evi\u30a8\u30c7\u30a3\u30bf\u304c\u8d77\u52d5\u3059\u308b\u3002vi\u30a8\u30c7\u30a3\u30bf\u304c\u8d77\u52d5\u3057\u305f\u3068\u304d\u3001Merge branch\u3068\u51fa\u3066\u304d\u305f\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-3192","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\/3192","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=3192"}],"version-history":[{"count":39,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3192\/revisions"}],"predecessor-version":[{"id":4970,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3192\/revisions\/4970"}],"wp:attachment":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3192"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=3192"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=3192"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}