{"id":7244,"date":"2019-11-21T23:07:37","date_gmt":"2019-11-21T14:07:37","guid":{"rendered":"http:\/\/www.code-magagine.com\/?p=7244"},"modified":"2023-05-27T18:59:09","modified_gmt":"2023-05-27T09:59:09","slug":"%e3%80%90git%e3%80%91%e3%82%b3%e3%83%b3%e3%83%95%e3%83%aa%e3%82%af%e3%83%88%e3%81%ab%e9%96%a2%e3%81%99%e3%82%8b%e7%9f%a5%e8%ad%98","status":"publish","type":"post","link":"http:\/\/www.code-magagine.com\/?p=7244","title":{"rendered":"\u3010Git\u3011\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u95a2\u3059\u308b\u77e5\u8b58"},"content":{"rendered":"<h2>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3059\u308b\u5834\u5408<\/h2>\n<ul>\n<li>\u30de\u30fc\u30b8\uff08\u30b3\u30df\u30c3\u30c8\u306e\u30de\u30fc\u30b8\uff09<\/li>\n<li>\u30ea\u30d0\u30fc\u30c8\uff08\u30b3\u30df\u30c3\u30c8\u306e\u6253\u3061\u6d88\u3057\uff09<\/li>\n<li>\u30ea\u30d9\u30fc\u30b9<\/li>\n<li>\u30d7\u30eb<\/li>\n<\/ul>\n<p>\u7279\u306b\u3001\u767a\u751f\u3059\u308b\u4f8b\u3068\u3057\u3066\u308f\u304b\u308a\u3084\u3059\u3044\u306e\u306f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u540c\u58eb\u3092<span style=\"color: #ff0000;\"><strong>\u30de\u30fc\u30b8<\/strong><\/span>\u3057\u3066\u3044\u308b\u969b\u306b\u540c\u3058\u7b87\u6240\u3092\u5225\u3005\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u540c\u3058\u7b87\u6240\u3092\u4fee\u6b63\u3057\u3066\u767a\u751f\u3059\u308b\u30b1\u30fc\u30b9\u3067\u306f\u306a\u3044\u3067\u3057\u3087\u3046\u304b\u3002<\/p>\n<h2>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3059\u308b\u6761\u4ef6<\/h2>\n<p>\u30de\u30fc\u30b8\u3059\u308b2\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u304c<span style=\"color: #ff0000;\"><strong>\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u306e\u540c\u3058\u7b87\u6240\u306b\u7570\u306a\u308b\u5909\u66f4\u3092\u52a0\u3048\u305f\u5834\u5408<\/strong><\/span>\uff08Git\u306f\u30de\u30fc\u30b8\u65b9\u6cd5\u3092\u5224\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u306a\u3044\uff09<\/p>\n<p>\u306a\u304a\u3001\u5b9f\u969b\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3059\u308b\u30bf\u30df\u30f3\u30b0\u3068\u3057\u3066\u306f\u3001<span style=\"color: #ff0000;\"><strong>\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u5b9f\u884c\u3057\u305f\u304cmaster\u30d6\u30e9\u30f3\u30c1\u3078\u306e\u30de\u30fc\u30b8\u306f\u307e\u3060\u3057\u3066\u306a\u3044\u72b6\u614b\u306e2\u3064\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u3042\u3063\u305f\u5834\u5408<\/strong><\/span>\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<h2>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u969b\u306b\u51fa\u308b\u8a18\u53f7\u307e\u3068\u3081<\/h2>\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u305f\u5834\u5408\u306f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u5185\u306b\u4e0b\u8a18\u306e\u3088\u3046\u306a\u8a18\u53f7\u304c\u8a18\u8ff0\u3055\u308c\u307e\u3059\u3002\u610f\u5473\u3092\u7406\u89e3\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n<table>\n<tbody>\n<tr>\n<th>\u8a18\u53f7<\/th>\n<th>\u610f\u5473<\/th>\n<\/tr>\n<tr>\n<td>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD<\/td>\n<td>\u81ea\u5206\u306e\u73fe\u5728\u4f7f\u7528\u4e2d\u30d6\u30e9\u30f3\u30c1\u306b\u3088\u308b\u5909\u66f4\u306e\u958b\u59cb\u4f4d\u7f6e<\/td>\n<\/tr>\n<tr>\n<td>========<\/td>\n<td>\u4f7f\u7528\u4e2d\u30d6\u30e9\u30f3\u30c1\u306b\u3088\u308b\u5909\u66f4\u3068\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u5148\u306e\u5909\u66f4\u306e\u5883\u76ee<\/td>\n<\/tr>\n<tr>\n<td>&gt;&gt;&gt;&gt;&gt;&gt;&gt; \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u5148\u30d6\u30e9\u30f3\u30c1\u540d<\/td>\n<td>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u5148\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\u306e\u7d42\u4e86\u5730\u70b9<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<p>\u300c&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\u3000\u301c\u3000========\u300d\u304c\u81ea\u5206\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u306e\u5909\u66f4\u5206\u3001\u300c========\u3000\u301c\u3000&gt;&gt;&gt;&gt;&gt;&gt;&gt; \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u5148\u30d6\u30e9\u30f3\u30c1\u540d\u300d\u304c\u30de\u30fc\u30b8\u5148\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u306e\u5909\u66f4\u5206\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<h3>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u5b9f\u969b\u306b\u8d77\u304d\u305f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u306e\u4f8b<\/h3>\n<pre class=\"lang:default decode:true \">                                &lt;tr&gt;\r\n                                    &lt;td&gt;XXXX&lt;\/td&gt;\r\n&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\r\n                                    &lt;td&gt;\u76ee\u6307\u305b\u8131\u521d\u5fc3\u8005\uff01\uff01&lt;\/td&gt;\r\n=======\r\n                                    &lt;td&gt;\u30ac\u30df\u304f\u3093&lt;\/td&gt;\t\t\t\t\t\r\n                                    &lt;td&gt;YYY&lt;\/td&gt;\r\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; master\r\n                                &lt;\/tr&gt;<\/pre>\n<p>\u306a\u304a\u3001\u3053\u308c\u3089\u306e\u8a18\u53f7\u306f\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3055\u305b\u308b\u5834\u5408\u306f<span style=\"color: #ff0000;\"><strong>\u4e0d\u8981\u306a\u3082\u306e\u306a\u306e\u3067\u5fc5\u305a\u524a\u9664\u3059\u308b<\/strong><\/span>\u3088\u3046\u306b\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n<h2>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3059\u308b\u6d41\u308c<\/h2>\n<ol>\n<li>\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3092\u9069\u5207\u306b\u30de\u30fc\u30b8\u3057\u3066\u4fee\u6b63\u3059\u308b\u3002\uff08\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u8a18\u53f7\u306e\u524a\u9664\u306f\u5fd8\u308c\u306a\u3044\u3088\u3046\u306b\u3057\u307e\u3057\u3087\u3046\u3002\uff09<\/li>\n<li>\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u30a8\u30ea\u30a2\u306b\u8ffd\u52a0\u3057\u3001\u30b3\u30df\u30c3\u30c8\u3092\u3059\u308b\u3002<\/li>\n<li>\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30d7\u30c3\u30b7\u30e5\u3092\u3059\u308b\u3002<\/li>\n<li>\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u3059\u308b\u3002\uff08\u30de\u30fc\u30b8\u304c\u9069\u5207\u306b\u884c\u308f\u308c\u3066\u3044\u308c\u3070Git\u306b\u3088\u308b\u81ea\u52d5\u30de\u30fc\u30b8\u304c\u884c\u3048\u308b\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002\uff09<\/li>\n<\/ol>\n<h2>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u8d77\u3053\u3055\u306a\u3044\u305f\u3081\u306e\u904b\u7528\u30eb\u30fc\u30eb<\/h2>\n<h3>\u8907\u6570\u4eba\u3067\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3057\u306a\u3044\u3053\u3068\u3002<\/h3>\n<h3>\u30de\u30fc\u30b8\u3092\u3059\u308b\u524d\u306b\u5909\u66f4\u4e2d\u306e\u72b6\u614b\u3092\u306a\u304f\u3059\u3053\u3068\u3002<\/h3>\n<p>\u305d\u3082\u305d\u3082\u3001\u81ea\u5206\u306e\u30d6\u30e9\u30f3\u30c1\u3067<span style=\"color: #ff0000;\"><strong>\u5909\u66f4\u4e2d\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308b\u5834\u5408\u306f\u30de\u30fc\u30b8\u304c\u3067\u304d\u307e\u305b\u3093\u3002<\/strong><\/span><\/p>\n<p>\u5909\u66f4\u4e2d\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u306a\u304f\u3059\u3088\u3046\u306b\u3057\u307e\u3057\u3087\u3046\u3002\uff08\u5177\u4f53\u7684\u306b\u306fcommit\u3084stash(\u5909\u66f4\u4e2d\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u4e00\u6642\u4fdd\u7ba1\u3059\u308b\u305f\u3081\u306e\u30b3\u30de\u30f3\u30c9)\u3092\u3059\u308b\u3088\u3046\u306b\u3057\u307e\u3057\u3087\u3046\u3002\uff09<\/p>\n<h3>pull\u3092\u3059\u308b\u969b\u306fpull\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5\u3057\u3066\u304b\u3089\u5b9f\u65bd\u3059\u308b\u3053\u3068<\/h3>\n<p>pull\u306e\u4ed5\u69d8\u3068\u3057\u3066\u73fe\u5728\u6240\u5c5e\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306b\u305d\u306e\u307e\u307e\u30de\u30fc\u30b8\u3055\u308c\u308b\u3068\u3044\u3046\u4ed5\u69d8\u306b\u306a\u3063\u3066\u3044\u308b\u305f\u3081\u3067\u3059\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3059\u308b\u5834\u5408 \u30de\u30fc\u30b8\uff08\u30b3\u30df\u30c3\u30c8\u306e\u30de\u30fc\u30b8\uff09 \u30ea\u30d0\u30fc\u30c8\uff08\u30b3\u30df\u30c3\u30c8\u306e\u6253\u3061\u6d88\u3057\uff09 \u30ea\u30d9\u30fc\u30b9 \u30d7\u30eb \u7279\u306b\u3001\u767a\u751f\u3059\u308b\u4f8b\u3068\u3057\u3066\u308f\u304b\u308a\u3084\u3059\u3044\u306e\u306f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u540c\u58eb\u3092\u30de\u30fc\u30b8\u3057\u3066\u3044\u308b\u969b\u306b\u540c\u3058\u7b87\u6240\u3092\u5225\u3005\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u540c\u3058\u7b87\u6240\u3092\u4fee\u6b63\u3057 [&hellip;]","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[32],"tags":[],"_links":{"self":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts\/7244"}],"collection":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=7244"}],"version-history":[{"count":16,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts\/7244\/revisions"}],"predecessor-version":[{"id":20191,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=\/wp\/v2\/posts\/7244\/revisions\/20191"}],"wp:attachment":[{"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=7244"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=7244"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.code-magagine.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=7244"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}