{"id":7206,"date":"2020-11-20T23:59:34","date_gmt":"2020-11-20T14:59:34","guid":{"rendered":"https:\/\/www.livrersdream.com\/?p=7206"},"modified":"2020-11-23T23:57:49","modified_gmt":"2020-11-23T14:57:49","slug":"git-squash","status":"publish","type":"post","link":"https:\/\/www.livrersdream.com\/?p=7206","title":{"rendered":"git squash"},"content":{"rendered":"

\n\"\u66c7\u308a\"\u4ed5\u4e8b\u306b\u76ee\u51e6\u304c\u3064\u3044\u3066\u3044\u308b\u306e\u3067\u3001\u671d\u306f\u30de\u30af\u30c9\u30ca\u30eb\u30c9\u306b\u884c\u304f\u3053\u3068\u304c\u3067\u304d\u305f\u3002\u3000\u65b0\u578b\u30b3\u30ed\u30ca\u30a6\u30a3\u30eb\u30b9\u306e\u7b2c\u4e09\u6ce2\u3068\u304b\u8a00\u308f\u308c\u3066\u3044\u3066\u3001\u9999\u5ddd\u770c\u3067\u306e\u611f\u67d3\u8005\u3082\u5897\u3048\u3066\u304d\u3066\u3044\u308b\u3051\u308c\u3069\u3001\u30de\u30af\u30c9\u30ca\u30eb\u30c9\u306b\u6765\u3066\u3044\u308b\u5e38\u9023\u305f\u3061\u306f\u3044\u3064\u3082\u901a\u308a\u3060\u3063\u305f\u3002\u3000\u81ea\u5206\u306f\u6700\u8fd1\u30de\u30af\u30c9\u30ca\u30eb\u30c9\u304b\u3089\u96e2\u308c\u6c17\u5473\u3060\u304c\u2026\u2026\u3000\u4e45\u3005\u306b\u82f1\u6587\u6cd5\u306e\u672c\u3092\u8aad\u3093\u3067\u3044\u3066\u3001\u4eca\u65e5\u306f\u300c\u4ee3\u540d\u8a5e\u300d\u306e\u90e8\u5206\u3060\u3063\u305f\u3002\u3000\u3053\u308c\u306f\u7c21\u5358\u3060\u3063\u305f\u304c\u3001\u8aad\u3093\u3067\u3044\u308b\u3068\u3044\u308d\u3044\u308d\u52c9\u5f37\u306b\u306a\u308b\u3002
\n
\n\u6628\u65e5\u61f8\u5ff5\u3057\u3066\u3044\u305fgit\u306e\u7d30\u304b\u3044\u64cd\u4f5c\u3002\u3000\u4eca\u3084\u3063\u3066\u3044\u308b\u3082\u306e\u306ffeature\u30d6\u30e9\u30f3\u30c1\u4f5c\u3063\u3066\u3084\u3063\u3066\u3044\u308b\u3002\u3000\u65e5\u3005\u306e\u4ed5\u4e8b\u7d42\u4e86\u6642\u306b\u30b3\u30df\u30c3\u30c8\u3057\u3066\u3044\u308b\u304c\u3001PC\u304c\u58ca\u308c\u305f\u308a\u3057\u3066\u5168\u3066\u5931\u3063\u305f\u3089\u4ed5\u4e8b\u304c100%\u7d42\u308f\u3089\u306a\u304f\u306a\u308b\u306e\u3067\u3001\u305d\u3046\u306a\u3089\u306a\u3044\u3088\u3046\u306b\u30ea\u30e2\u30fc\u30c8\u306bPUSH\u3082\u3057\u3066\u3044\u308b\u3002\u3000\u3067\u3001\u4e00\u901a\u308a\u7d44\u307f\u7d42\u308f\u3063\u305f\u306e\u3067\u3001\u305d\u308c\u3092develop\u306b\u30de\u30fc\u30b8\u3057\u305f\u3044\u306e\u3060\u3051\u3069\u3001\u305d\u306e\u90e8\u5206\u3092\u3069\u3046\u3057\u3088\u3046\u304b\u8003\u3048\u3066\u3044\u305f\u3002
\n\u738b\u9053\u306a\u3084\u308a\u65b9\u3060\u3068\u3001feature\u30d6\u30e9\u30f3\u30c1\u3092squash\u3057\u3066\u4e00\u3064\u306e\u30b3\u30df\u30c3\u30c8\u306b\u307e\u3068\u3081\u3066\u3001\u305d\u308c\u3092develop\u306bmerge\u3067\u306f\u306a\u304frebase\u3059\u308b\u306e\u304c\u826f\u3055\u305d\u3046\u3060\u3063\u305f\u306e\u3060\u3051\u3069\u3001feature\u30d6\u30e9\u30f3\u30c1\u3092\u30ea\u30e2\u30fc\u30c8\u306bpush\u3057\u3066\u306a\u3044\u524d\u63d0\u306e\u64cd\u4f5c\u3060\u3063\u305f\u3002
\n\u81ea\u5206\u306fPUSH\u3057\u3066\u3044\u308b\u306e\u3067\u3001squash\u3057\u305f\u3042\u3068\u3001force push\u3059\u308b\u3089\u3057\u3044\u306e\u3060\u3051\u3069\u3001\u305d\u3046\u3059\u308b\u3068\u3001\u3082\u3057\u4ed6\u306bfeature\u30d6\u30e9\u30f3\u30c1\u3092pull\u3057\u3066\u3044\u308b\u4eba\u304c\u3044\u305f\u3089\u3001\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u304c\u6539\u5909\u3055\u308c\u308b\u305f\u3081\u3001\u305d\u306e\u4eba\u306fpull\u3067\u304d\u306a\u304f\u306a\u308b\u3089\u3057\u3044\u3002
\n\u305f\u3060\u3001\u81ea\u5206\u5c02\u7528\u306efeature\u30d6\u30e9\u30f3\u30c1\u306a\u306e\u3067\u3001\u4ed6\u306e\u4eba\u304cpull\u3057\u3066\u3044\u308b\u306e\u306f\u77e5\u3063\u305f\u3053\u3063\u3061\u3083\u306a\u3044\u611f\u3058\u306a\u306e\u3060\u304c\u2026\u2026
\n\u3068\u308a\u3042\u3048\u305a\u3001\u3053\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u3084\u308b\u306e\u306f\u6016\u3044\u306e\u3067\u3001\u4e00\u65e6\u81ea\u5206\u306egithub\u30a2\u30ab\u30a6\u30f3\u30c8\u3067\u30ea\u30dd\u30b8\u30c8\u30ea\u4f5c\u3063\u3066\u3001\u3044\u308d\u3044\u308d\u30c6\u30b9\u30c8\u3057\u3066\u307f\u305f\u3002
\n\u3067\u3001\u6700\u7d42\u7684\u306b\u3084\u3063\u305f\u624b\u9806\u3001Gitkraken\u3064\u304b\u3063\u3066\u3044\u308b\u306e\u3067\u3001\u305d\u308c\u3067\u306e\u624b\u9806\u3060\u3051\u3069\u3001
\nsquash\u30671\u3064\u306e\u30b3\u30df\u30c3\u30c8\u306b\u307e\u3068\u3081\u308b\u3001PUSH\u3082PULL\u3082\u305b\u305afeature\u30d6\u30e9\u30f3\u30c1\u3082\u5b8c\u4e86\u3055\u305b\u305a\u3001squash\u3067\u307e\u3068\u3081\u305f\u30b3\u30df\u30c3\u30c8\u3092develop\u306brebase\u3002\u3000\u624b\u5143\u306efeature\u30d6\u30e9\u30f3\u30c1\u306fdelete\u3001\u30ea\u30e2\u30fc\u30c8\u306efeature\u30d6\u30e9\u30f3\u30c1\u3082delete\u3002
\n\u3053\u308c\u3067\u898b\u305f\u76ee\u4e0a\u306f\u4e0a\u624b\u304f\u884c\u3063\u305f\u3002\u3000feature\u30d6\u30e9\u30f3\u30c1\u6d88\u3057\u3061\u3083\u3063\u3066\u308b\u306e\u3067\u3001\u3053\u308c\u304c\u6b63\u3057\u3044\u624b\u9806\u30fb\u904b\u7528\u306a\u306e\u304b\u304c\u5168\u304f\u308f\u304b\u3089\u306a\u3044\u304c\u2026\u2026
\n
\n\u4eca\u591c\u306f\u30b8\u30e7\u30ae\u30f3\u30b0\u30c8\u30ec\u30fc\u30cb\u30f3\u30b0\u306f\u7121\u3057\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"

\u4ed5\u4e8b\u306b\u76ee\u51e6\u304c\u3064\u3044\u3066\u3044\u308b\u306e\u3067\u3001\u671d\u306f\u30de\u30af\u30c9\u30ca\u30eb\u30c9\u306b\u884c\u304f\u3053\u3068\u304c\u3067\u304d\u305f\u3002\u3000\u65b0\u578b\u30b3\u30ed\u30ca\u30a6\u30a3\u30eb\u30b9\u306e\u7b2c\u4e09\u6ce2\u3068\u304b\u8a00\u308f\u308c\u3066\u3044\u3066\u3001\u9999\u5ddd\u770c\u3067\u306e\u611f\u67d3\u8005\u3082\u5897\u3048\u3066\u304d\u3066\u3044\u308b\u3051\u308c\u3069\u3001\u30de\u30af\u30c9\u30ca\u30eb\u30c9\u306b\u6765\u3066\u3044\u308b\u5e38\u9023\u305f\u3061\u306f\u3044\u3064\u3082\u901a\u308a\u3060\u3063\u305f\u3002\u3000\u81ea\u5206\u306f\u6700\u8fd1\u30de\u30af\u30c9\u30ca … \u7d9a\u304d\u3092\u8aad\u3080 →<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[3],"tags":[],"class_list":["post-7206","post","type-post","status-publish","format-standard","hentry","category-everyday"],"_links":{"self":[{"href":"https:\/\/www.livrersdream.com\/index.php?rest_route=\/wp\/v2\/posts\/7206","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.livrersdream.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.livrersdream.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.livrersdream.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.livrersdream.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=7206"}],"version-history":[{"count":0,"href":"https:\/\/www.livrersdream.com\/index.php?rest_route=\/wp\/v2\/posts\/7206\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.livrersdream.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=7206"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.livrersdream.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=7206"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.livrersdream.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=7206"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}