{"id":1029,"date":"2021-10-20T02:38:46","date_gmt":"2021-10-19T17:38:46","guid":{"rendered":"https:\/\/suzutukiblog.com\/?p=1029"},"modified":"2022-01-20T01:54:04","modified_gmt":"2022-01-19T16:54:04","slug":"github3","status":"publish","type":"post","link":"https:\/\/suzutukiblog.com\/index.php\/2021\/10\/20\/github3\/","title":{"rendered":"GitHub3(\u30d6\u30e9\u30f3\u30c1\u3001\u7af6\u5408\u306e\u89e3\u6d88\u3001git commit \u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u4fee\u6b63\u3059\u308b–amend -m)"},"content":{"rendered":"

\u305d\u306e\uff12\u304b\u3089\u7d9a\u304d\u307e\u3059<\/a><\/p>\n

\u30d6\u30e9\u30f3\u30c1\u3068\u306f\uff1f<\/h3>\n

\u30fb\u30d6\u30e9\u30f3\u30c1\u306f\u5225\u3005\u306e\u4f5c\u696d\u3092\u4e26\u884c\u3057\u3066\u884c\u3046\u305f\u3081\u306b\u5229\u7528
\n\u30fb\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u308b\u3053\u3068\u3067\u5404\u30d6\u30e9\u30f3\u30c1\u3054\u3068\u306b\u5225\u306e\u4f5c\u696d\u3092\u540c\u6642\u306b\u9032\u3081\u308b\u3053\u3068\u304c\u3067\u304d\u308b
\n\u30fb\u5b9f\u52d9\u4e0amaster\u30d6\u30e9\u30f3\u30c1\u3092\u76f4\u63a5\u7de8\u96c6\u3059\u308b\u3053\u3068\u306f\u306a\u3044\u3089\u3057\u3044
\n\u30fbmaster\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u3066\u3001\u305d\u308c\u3092\u7de8\u96c6\u3057\u3066\u30de\u30b9\u30bf\u30fc\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30de\u30fc\u30b8\u3059\u308b\u306e\u304c\u57fa\u672c<\/p>\n

\u73fe\u5728\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u78ba\u8a8d<\/strong>\r\ngit branch\r\n\r\n<\/strong>\u30d6\u30e9\u30f3\u30c1\u306e\u751f\u6210(\u4f8b\u3068\u3057\u3066feature-A)\r\ngit branch feature-A\r\n\r\n<\/strong>\u30d6\u30e9\u30f3\u30c1feature-A\u306b\u5207\u308a\u66ff\u3048\r\ngit checkout feature-A<\/strong><\/pre>\n
<\/p>\n
a.js\u306bconsole.log(‘feauture-A \u30d6\u30e9\u30f3\u30c1\u3067\u8ffd\u52a0’);\u3000\u8ffd\u52a0<\/p>\n
git add a.js\r\ngit diff HEAD\r\ngit commit -m \"update to feature-A\"<\/strong><\/pre>\n
\u30de\u30b9\u30bf\u30fcbranch\u306b\u79fb\u52d5<\/p>\n
git checkout master\r\ngit branch<\/strong><\/pre>\n
 <\/p>\n
\"\"<\/p>\n
\u30d6\u30e9\u30f3\u30c1\u3092\u308f\u3051\u3066\u958b\u767a\u3059\u308b\u3053\u3068\u3067\u3001\u8907\u6570\u306e\u6a5f\u80fd\u958b\u767a\u3092\u30d6\u30e9\u30f3\u30c1\u9593\u3067\u5f71\u97ff\u4e0e\u3048\u308b\u3053\u3068\u306a\u304f\u540c\u6642\u9032\u884c\u3067\u884c\u3046\u3053\u3068\u304c\u3067\u304d\u308b\u3002<\/p>\n
\u3064\u307e\u308a\u30c1\u30fc\u30e0\u958b\u767a\u3059\u308b\u305f\u3081\u306b\u90fd\u5408\u304c\u826f\u3044<\/p>\n
\u4e00\u3064\u524d\u306b\u9078\u629e\u3057\u3066\u3044\u305f\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048\u308b\u306b\u306f\r\ngit checkout -\r\ngit branch\r\n\r\n* feature-A\r\nmaster<\/strong><\/pre>\n
\u30d6\u30e9\u30f3\u30c1\u306e\u30de\u30fc\u30b8<\/h3>\n
git checkout master\r\ngit merge --no-ff feature-A<\/strong><\/pre>\n
\"\"
\n\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u30de\u30fc\u30b8\u3055\u308c\u305f\u5c65\u6b74\u3092\u6b8b\u3059\u305f\u3081\u306b\u2191\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u3064\u3051\u3066\u3044\u308b
\n\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u5316\u3092\u8996\u899a\u7684\u306b\u78ba\u8a8d\u3059\u308b\u305f\u3081\u306b\u306f<\/p>\n
git log --graph<\/strong><\/pre>\n
\"\"<\/p>\n
\u7af6\u5408\u306e\u89e3\u6d88(\u308f\u3056\u3068\u7af6\u5408\u3092\u304a\u3053\u3057\u89e3\u6d88\u3059\u308b)<\/h3>\n
git checkout -b feature-B\r\na.js\u306e\uff11\u884c\u76ee\u3092console.log('BBB');\u306b\u3059\u308b\r\ngit branch\r\ngit add a.js\r\ngit commit -m \"update to feature-B\"\r\ngit checkout master\r\ngit checkout -b feature-C\r\na.js\u306e\uff11\u884c\u76ee\u3092console.log('CC');\u306b\u3059\u308b\r\ngit add a.js\r\ngit commit -m \"update to feature-C\"\r\ngit checkout master<\/strong><\/pre>\n
feature-B\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8<\/p>\n
git merge --no-ff feature-B<\/strong><\/pre>\n
feature-C\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8<\/p>\n
git merge --no-ff feature-C<\/strong><\/pre>\n
\"\"<\/p>\n
console.log(‘CC’);\u3092\u6b63\u3057\u3044\u65b9\u306b\u3057\u305f\u3044\u3068\u304d<\/p>\n
\"\"<\/p>\n
\u2191\u306e\u3088\u3046\u306b\u4fee\u6b63\u3057\u3066\u30b3\u30df\u30c3\u30c8\u3057\u76f4\u3059<\/p>\n
git add a.js\r\ngit commit -m \"fixed conflict\"<\/strong><\/pre>\n
\u5b9f\u52d9\u4e0a\u306f\u7af6\u5408\u3092\u89e3\u6d88\u3059\u308b\u3068\u304d\u306b\u30d0\u30b0\u306b\u306a\u3089\u306a\u3044\u3088\u3046\u306b\u6c17\u3092\u3064\u3051\u308b\u3001\u305d\u3082\u305d\u3082\u7af6\u5408\u304c\u767a\u751f\u3057\u306a\u3044\u3088\u3046\u306b\u30b3\u30df\u30e5\u30cb\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u3059\u308b\u306a\u3069\u3059\u308b\u3002<\/p>\n
\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u4fee\u6b63\u3059\u308b<\/h3>\n
git commit --amend -m \"fixed conflict -update-\"<\/strong><\/pre>\n
\"\"<\/p>\n
\u305d\u306e4\u306b\u7d9a\u304d\u307e\u3059<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"
\u305d\u306e\uff12\u304b\u3089\u7d9a\u304d\u307e\u3059 \u30d6\u30e9\u30f3\u30c1\u3068\u306f\uff1f \u30fb\u30d6\u30e9\u30f3\u30c1\u306f\u5225\u3005\u306e\u4f5c\u696d\u3092\u4e26\u884c\u3057\u3066\u884c\u3046\u305f\u3081\u306b\u5229\u7528 \u30fb\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u308b\u3053\u3068\u3067\u5404\u30d6\u30e9\u30f3\u30c1\u3054\u3068\u306b\u5225\u306e\u4f5c\u696d\u3092\u540c\u6642\u306b\u9032\u3081\u308b\u3053\u3068\u304c\u3067\u304d\u308b \u30fb\u5b9f\u52d9\u4e0amaster\u30d6\u30e9\u30f3\u30c1\u3092\u76f4\u63a5\u7de8\u96c6\u3059\u308b\u3053\u3068\u306f\u306a\u3044\u3089\u3057\u3044 \u30fb […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_monsterinsights_skip_tracking":false,"_monsterinsights_sitenote_active":false,"_monsterinsights_sitenote_note":"","_monsterinsights_sitenote_category":0,"footnotes":""},"categories":[6,27],"tags":[],"class_list":["post-1029","post","type-post","status-publish","format-standard","hentry","category-github","category-programming-note"],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/suzutukiblog.com\/index.php\/wp-json\/wp\/v2\/posts\/1029","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/suzutukiblog.com\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/suzutukiblog.com\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/suzutukiblog.com\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/suzutukiblog.com\/index.php\/wp-json\/wp\/v2\/comments?post=1029"}],"version-history":[{"count":14,"href":"https:\/\/suzutukiblog.com\/index.php\/wp-json\/wp\/v2\/posts\/1029\/revisions"}],"predecessor-version":[{"id":4430,"href":"https:\/\/suzutukiblog.com\/index.php\/wp-json\/wp\/v2\/posts\/1029\/revisions\/4430"}],"wp:attachment":[{"href":"https:\/\/suzutukiblog.com\/index.php\/wp-json\/wp\/v2\/media?parent=1029"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/suzutukiblog.com\/index.php\/wp-json\/wp\/v2\/categories?post=1029"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/suzutukiblog.com\/index.php\/wp-json\/wp\/v2\/tags?post=1029"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}