{"id":2531,"date":"2014-02-10T09:48:23","date_gmt":"2014-02-10T00:48:23","guid":{"rendered":"http:\/\/aatljapan.wpengine.com\/?p=2531"},"modified":"2014-02-12T12:32:34","modified_gmt":"2014-02-12T03:32:34","slug":"simple-git-workflow-simple","status":"publish","type":"post","link":"https:\/\/www.atlassian.com\/ja\/blog\/simple-git-workflow-simple","title":{"rendered":"Git \u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3067\u30b7\u30f3\u30d7\u30eb\u306b"},"content":{"rendered":"<p>\u65e2\u306b\u591a\u304f\u306e\u30c1\u30fc\u30e0\u306f <span class=\"text codecolorer\">git<\/span> \u3078\u306e\u79fb\u884c\u3092\u6e08\u307e\u305b\u3066\u304a\u308a\u3001\u307e\u305f\u66f4\u306b\u591a\u304f\u306e\u30c1\u30fc\u30e0\u304c\u73fe\u5728\u305d\u306e\u79fb\u884c\u6bb5\u968e\u306b\u3042\u308a\u307e\u3059\u3002\u4e00\u4eba\u306e\u30c7\u30d9\u30ed\u30c3\u30d1\u30fc\u3092\u8a13\u7df4\u3057\u3066\u3001\u63a1\u7528\u306e\u652f\u63f4\u3068\u3057\u3066 <strong>\u30c1\u30e3\u30f3\u30d4\u30aa\u30f3<\/strong> \u3092\u4efb\u547d\u3059\u308b\u3053\u3068\u306f\u91cd\u8981\u3067\u3059\u3002\u305d\u308c\u306b\u52a0\u3048\u3001\u7269\u4e8b\u3092\u3042\u307e\u308a\u8907\u96d1\u306b\u3057\u306a\u3044\u3001\u30b7\u30f3\u30d7\u30eb\u3067\u6271\u3044\u3084\u3059\u3044\u3001\u30b3\u30fc\u30c9\u30b3\u30e9\u30dc\u30ec\u30fc\u30b7\u30e7\u30f3\u306e\u30d7\u30e9\u30af\u30c6\u30a3\u30b9\u3092\u9078\u3076\u4e8b\u304c\u809d\u8981\u3067\u3059\u3002<span class=\"text codecolorer\">git<\/span> \u3067\u3042\u308c\u3070\u3001\u975e\u5e38\u306b\u8907\u96d1\u306a\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3067\u3042\u3063\u3066\u3082\u9b54\u6cd5\u306e\u3088\u3046\u306b\u30b7\u30f3\u30d7\u30eb\u306b\u3067\u304d\u307e\u3059\u3002\u79c1\u306f\u5b9f\u969b\u306b\u305d\u308c\u3092\u76ee\u306e\u5f53\u305f\u308a\u306b\u3057\u305f\u306e\u3067\u3001\u9593\u9055\u3044\u3042\u308a\u307e\u305b\u3093\u3002<\/p>\n<p>\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u95a2\u3059\u308b\u30de\u30cb\u30e5\u30a2\u30eb\u306f <span class=\"text codecolorer\">git<\/span> \u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u306f\u3044\u307e\u305b\u3093\u3002\u3057\u304b\u3057\u3001\u3053\u306e\u30c8\u30d4\u30c3\u30af\u306b\u95a2\u3057\u3066\u591a\u304f\u306e\u4eba\u304c\u8cea\u554f\u3092\u62b1\u3048\u3066\u3044\u308b\u4e8b\u3092\u8003\u616e\u3059\u308c\u3070\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3079\u304d\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u305d\u308c\u3067\u3082\u3054\u5b89\u5fc3\u4e0b\u3055\u3044\u3002\u6211\u3005\u306f\u5f79\u306b\u7acb\u3064\u8cc7\u6599\u3092\u4f5c\u308b\u3079\u304f\u3001\u73fe\u5728\u596e\u95d8\u4e2d\u3067\u3059\u3002<\/p>\n<h2>\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u95a2\u3059\u308b\u6700\u8fd1\u306e\u30a6\u30a7\u30d3\u30ca\u30fc\u304a\u3088\u3073\u30ac\u30a4\u30c9<\/h2>\n<div style=\"float: right;\">\n<p><iframe loading=\"lazy\" src=\"\/\/www.youtube.com\/embed\/9SZ7kSQ2424\" height=\"208\" width=\"260\" allowfullscreen=\"\" frameborder=\"0\"><\/iframe><\/p>\n<\/div>\n<p><iframe loading=\"lazy\" src=\"\/\/www.youtube.com\/embed\/B78AdLNZBQQ\" height=\"208\" width=\"260\" allowfullscreen=\"\" frameborder=\"0\"><\/iframe><\/p>\n<p>\u30ad\u30ec\u30a4\u306a\u5199\u771f\u3084\u3001\u6587\u5b57\u3092\u8aad\u3080\u306e\u304c\u597d\u304d\u306a\u65b9\u306b\u306f\u3001\u6211\u3005\u306e <span class=\"text codecolorer\">git<\/span> \u30c1\u30e5\u30fc\u30c8\u30ea\u30a2\u30eb\u30b5\u30a4\u30c8\u306e\u6700\u3082\u4eba\u6c17\u306e\u3042\u308b\u30bb\u30af\u30b7\u30e7\u30f3\u306e\u4e00\u3064\u3067\u3042\u308b <em>\u30ef\u30fc\u30af\u30d5\u30ed\u30fc<\/em> \u30bb\u30af\u30b7\u30e7\u30f3\u304c\u304a\u52e7\u3081\u3067\u3059\u3002<\/p>\n<p><a href=\"https:\/\/www.atlassian.com\/ja\/git\/workflows\"><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-large wp-image-27515\" style=\"float: left; border: 1px solid #222222; margin-right: 20px; margin-bottom: 25px;\" alt=\"git-microsite\" src=\"http:\/\/atlassian.wpengine.netdna-cdn.com\/wp-content\/uploads\/git-microsite-600x544.png\" width=\"300\" height=\"272\" \/><\/a><\/p>\n<p>\u305f\u3060\u3057\u3001\u3053\u308c\u3089\u306e\u30bb\u30af\u30b7\u30e7\u30f3\u3092\u63a2\u7d22\u3059\u308b\u524d\u306b\u3001\u3082\u3046\u3057\u3070\u3089\u304f\u304a\u4ed8\u304d\u5408\u3044\u4e0b\u3055\u3044\u3002\u975e\u5e38\u306b\u30af\u30fc\u30eb\u306a\u8a71\u3092\u304a\u4f1d\u3048\u3057\u307e\u3059\u3002<\/p>\n<p><em>\u7d99\u7d9a\u7684\u30c7\u30ea\u30d0\u30ea\u30fc<\/em> \u306e\u7c21\u5358\u306a\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u95a2\u3059\u308b\u3001\u7c21\u6f54\u304b\u3064\u5b8c\u5168\u306a\u8aac\u660e\u3092\u3057\u305f\u3044\u3068\u601d\u3044\u307e\u3059\u3002\u524d\u63d0\u6761\u4ef6\u3068\u3057\u3066\u3001\u3042\u306a\u305f\u3068\u3042\u306a\u305f\u306e\u30c1\u30fc\u30e0\u306f\u5c11\u306a\u304f\u3068\u3082 <span class=\"text codecolorer\">git<\/span> \u306b\u591a\u5c11\u306f\u6163\u308c\u89aa\u3057\u3093\u3067\u3044\u308b\u4e8b\u3001\u305d\u3057\u3066\u4e8c\u3064\u306e\u5f62\u5f0f (\u30a4\u30f3\u30bf\u30e9\u30af\u30c6\u30a3\u30d6\u3068\u305d\u3046\u3067\u306f\u306a\u3044\u3082\u306e) \u306e <span class=\"text codecolorer\">rebase<\/span> \u30b3\u30de\u30f3\u30c9\u306b\u95a2\u3059\u308b\u5341\u5206\u306a\u77e5\u8b58\u3092\u6709\u3057\u3066\u3044\u308b\u4e8b\u304c\u6c42\u3081\u3089\u308c\u307e\u3059\u3002<\/p>\n<div style=\"margin-bottom: 25px; clear: both;\"><\/div>\n<h2>\u7d99\u7d9a\u7684\u30c7\u30ea\u30d0\u30ea\u30fc\u306b\u304a\u3051\u308b\u30d6\u30e9\u30f3\u30c1 \u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306e\u57fa\u672c\u4e2d\u306e\u57fa\u672c<\/h2>\n<p>\u79c1\u304c\u8aac\u660e\u3057\u305f\u3044\u7c21\u5358\u306a\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u306f\u3001\u4e8c\u3064\u306e\u30ac\u30a4\u30c9\u7684\u306a\u539f\u5247\u304c\u5b58\u5728\u3057\u307e\u3059\u3002<\/p>\n<ul>\n<li><span class=\"text codecolorer\">master<\/span> \u306f\u3001\u30d7\u30ed\u30c0\u30af\u30b7\u30e7\u30f3\uff08\u672c\u756a\u7a3c\u50cd\uff09\u3067\u30c7\u30d7\u30ed\u30a4\u53ef\u80fd\u306a\u3082\u306e\u306e\u307f\u3092\u6271\u3046<\/li>\n<li><span class=\"text codecolorer\">rebase<\/span> \u3092\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u958b\u767a\u4e2d\u306b\u884c\u3044\u3001\u7d42\u4e86\u3057\u305f\u3089\u660e\u793a\u7684\u306b <span class=\"text codecolorer\">merge<\/span>\u3059\u308b (\u975e\u30d5\u30a1\u30b9\u30c8\u30d5\u30a9\u30ef\u30fc\u30c9)<\/li>\n<\/ul>\n<p><span class=\"text codecolorer\">rebase<\/span> \u3092\u4f7f\u7528\u3057\u3066\u5909\u66f4\u30bb\u30c3\u30c8\u3092\u30d7\u30eb\u3059\u308b\u3068\u3001\u4f5c\u696d\u4e2d\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u3092\u66f8\u304d\u63db\u3048\u3001\u5909\u66f4\u5185\u5bb9\u3092\u4e00\u756a\u4e0a\u306b\u4fdd\u3061\u307e\u3059\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-full wp-image-27517\" style=\"float: right;\" alt=\"rebase-on-feature\" src=\"http:\/\/atlassian.wpengine.netdna-cdn.com\/wp-content\/uploads\/rebase-on-feature.gif\" width=\"300\" height=\"167\" \/><\/p>\n<p><img loading=\"lazy\" decoding=\"async\" class=\"alignnone size-full wp-image-27535\" alt=\"rebase-on-master\" src=\"http:\/\/atlassian.wpengine.netdna-cdn.com\/wp-content\/uploads\/rebase-on-master.gif\" width=\"300\" height=\"167\" \/><\/p>\n<p>\u3053\u306e\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u304a\u3044\u3066\u6c42\u3081\u3066\u3044\u308b <span class=\"text codecolorer\">rebase<\/span> \u306f\u3001\u4e8c\u3064\u76ee\u306e\u56f3\u306b\u3042\u308a\u307e\u3059\u3002<\/p>\n<p>\u3053\u308c\u3089\u306e\u30ac\u30a4\u30c9\u7684\u306a\u539f\u5247\u3092\u5b66\u3093\u3060\u3068\u3053\u308d\u3067\u3001\u4e03\u3064\u306e\u30b9\u30c6\u30c3\u30d7\u3092\u89e3\u8aac\u3057\u3066\u3044\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n<h3>1. \u521d\u3081\u306b\u3001<span class=\"text codecolorer\">master<\/span>\u304b\u3089\u6700\u65b0\u306e\u5909\u66f4\u5185\u5bb9\u3092\u30d7\u30eb\u3059\u308b<\/h3>\n<p>\u3053\u308c\u306f\u3001\u4e00\u822c\u7684\u306a <span class=\"text codecolorer\">git<\/span> \u30b3\u30de\u30f3\u30c9\u3092\u5229\u7528\u3059\u308b\u4e8b\u3067\u53ef\u80fd\u3067\u3059\u3002<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/>2<br \/>3<br \/><\/div><\/td><td><div class=\"text codecolorer\">git checkout master<br \/>\r\ngit fetch origin<br \/>\r\ngit merge master<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u79c1\u306f <span class=\"text codecolorer\">fetch\/merge<\/span> \u3092\u5229\u7528\u3057\u3066\u3088\u308a\u660e\u793a\u7684\u3067\u3042\u308a\u305f\u3044\u306e\u3067\u3059\u304c\u3001\u3053\u306e\u4e8c\u3064\u306e\u30b3\u30de\u30f3\u30c9\u306f <span class=\"text codecolorer\">git pull origin master<\/span>\u3068\u540c\u7b49\u306e\u3082\u306e\u3067\u3059\u3002<\/p>\n<h3>2. \u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u5206\u96e2\u3042\u308b\u3044\u306f\u30d0\u30b0\u4fee\u6b63\u4f5c\u696d\u306e\u305f\u3081\u306b\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3059\u308b<\/h3>\n<p>\u6b21\u306b\u3001\u6a5f\u80fd\u3042\u308b\u3044\u306f\u30d0\u30b0\u4fee\u6b63\u306e\u305f\u3081\u306b\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git checkout -b PRJ-123-awesome-feature<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u3053\u3053\u3067\u304a\u898b\u305b\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u540d\u69cb\u9020\u306f\u5358\u306b\u6211\u3005\u304c\u4f7f\u7528\u3057\u3066\u3044\u308b\u3082\u306e\u3067\u3042\u308a\u3001\u7686\u3055\u3093\u306f\u6163\u308c\u89aa\u3057\u3093\u3060\u3084\u308a\u65b9\u3092\u9078\u3093\u3067\u9802\u3044\u3066\u7d50\u69cb\u3067\u3059\u3002<\/p>\n<h3>3. \u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u306b\u95a2\u3059\u308b\u4f5c\u696d\u3092\u958b\u59cb\u3059\u308b<\/h3>\n<p>\u5fc5\u8981\u306a\u3060\u3051\u306e\u6642\u9593\u3092\u5272\u3044\u3066\u3001\u6a5f\u80fd\u306e\u4f5c\u696d\u3092\u884c\u3063\u3066\u4e0b\u3055\u3044\u3002\u5fc5\u305a\u3001\u30b3\u30df\u30c3\u30c8\u306f\u6709\u610f\u7fa9\u306a\u3082\u306e\u306b\u3057\u3066\u3001\u5225\u3005\u306e\u5909\u66f4\u5185\u5bb9\u306e\u30af\u30e9\u30b9\u30bf\u30ea\u30f3\u30b0\u3092\u884c\u308f\u306a\u3044\u3067\u4e0b\u3055\u3044\u3002<\/p>\n<h3>4. \u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u3092\u3001\u30de\u30b9\u30bf\u30fc\u306b\u304a\u3051\u308b\u6700\u65b0\u306e\u5909\u66f4\u5185\u5bb9\u3067\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3057\u7d9a\u3051\u308b\u306b\u306f\u3001<span class=\"text codecolorer\">rebase<\/span>\u3092\u5229\u7528\u3059\u308b<\/h3>\n<p>\u958b\u767a\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u306e\u9593\u306f\u3001\u5b9a\u671f\u7684\u306b<span class=\"text codecolorer\">master<\/span>\u306b\u304a\u3051\u308b\u6700\u65b0\u306e\u5909\u66f4\u5185\u5bb9\u3067\u6a5f\u80fd\u30d6\u30e9\u30f3\u30c1\u3092\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3057\u307e\u3059\u3002\u3053\u308c\u306f\u3001\u4ee5\u4e0b\u306e\u65b9\u6cd5\u3067\u884c\u3044\u307e\u3059\u3002<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/>2<br \/><\/div><\/td><td><div class=\"text codecolorer\">git fetch origin<br \/>\r\ngit rebase origin\/master<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u540c\u3058\u5171\u6709\u306e\u30ea\u30e2\u30fc\u30c8\u6a5f\u80fd\u30d6\u30e9\u30f3\u30c1\u306b\u304a\u3044\u3066\u3001\u4ed6\u306e\u4eba\u305f\u3061\u3082\u4f5c\u696d\u3057\u3066\u3044\u308b\u3068\u3044\u3046\u3001\u3069\u3061\u3089\u304b\u3068\u3044\u3048\u3070\u73cd\u3057\u3044\u30b1\u30fc\u30b9\u306b\u304a\u3044\u3066\u306f\u3001\u305d\u306e\u5909\u66f4\u5185\u5bb9\u3082\u307e\u305f <span class=\"text codecolorer\">rebase<\/span> \u3057\u307e\u3059\u3002<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git rebase origin\/PRJ-123-awesome-feature<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u3053\u306e\u6642\u70b9\u3067\u3001\u30ea\u30d9\u30fc\u30b9\u304b\u3089\u51fa\u73fe\u3059\u308b\u4e00\u5207\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3057\u307e\u3059\u3002<\/p>\n<p><span class=\"text codecolorer\">rebase<\/span> \u4e2d\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3059\u308b\u4e8b\u3067\u3001\u6a5f\u80fd\u958b\u767a\u306e\u6700\u5f8c\u306b\u306f\u5e38\u306b\u30af\u30ea\u30fc\u30f3\u306a\u30de\u30fc\u30b8\u3092\u5f97\u3089\u308c\u307e\u3059\u3002\u307e\u305f\u3001\u3053\u308c\u306b\u3088\u3063\u3066\u6a5f\u80fd\u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u3092\u30af\u30ea\u30fc\u30f3\u306b\u4fdd\u3064\u4e8b\u3067\u3001\u507d\u308a\u306e\u30ce\u30a4\u30ba\u306b\u6c17\u3092\u3082\u307e\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u305b\u3093\u3002<\/p>\n<h3>5. \u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3092\u53d7\u3051\u308b\u6e96\u5099\u304c\u6574\u3063\u305f\u3089\u9060\u9694\u7684\u306b\u30d6\u30e9\u30f3\u30c1\u3092\u30d7\u30c3\u30b7\u30e5\u3057\u3066\u3001\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u4f5c\u6210\u3059\u308b<\/h3>\n<p>\u4f5c\u696d\u5185\u5bb9\u3092\u5171\u6709\u3057\u3066\u3001\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3092\u53d7\u3051\u308b\u6e96\u5099\u304c\u6574\u3063\u305f\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u65b9\u6cd5\u3067\u30d6\u30e9\u30f3\u30c1\u3092\u9060\u9694\u7684\u306b\u30d7\u30c3\u30b7\u30e5\u3057\u307e\u3059<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/>2<br \/>3<br \/><\/div><\/td><td><div class=\"text codecolorer\">git push -u origin PRJ-123-awesome-feature <br \/>\r\n<br \/>\r\n(if the branch is already set as 'upstream' and your remote is called 'origin', 'git push' is enough)<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u3053\u3046\u3057\u3066\u3001\u304a\u597d\u307f\u306e <span class=\"text codecolorer\">git<\/span> \u30b5\u30fc\u30d0 (\u4f8b\u3048\u3070 <a href=\"https:\/\/www.atlassian.com\/ja\/software\/stash\/overview\" target=\"_blank\">Stash<\/a> \u307e\u305f\u306f <a href=\"https:\/\/bitbucket.org\">Bitbucket<\/a>)\u4e0a\u3067\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u4f5c\u6210\u3067\u304d\u307e\u3059\u3002 \u6700\u521d\u306e\u30d7\u30c3\u30b7\u30e5\u5f8c\u306f\u3001\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306b\u4f55\u5ea6\u3082\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u30d7\u30c3\u30b7\u30e5\u3057\u7d9a\u3051\u3089\u308c\u307e\u3059\u3002\u3053\u308c\u306f\u3001\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u306b\u5bfe\u3059\u308b\u53cd\u5fdc\u3001\u3042\u308b\u3044\u306f\u6a5f\u80fd\u958b\u767a\u304c\u307e\u3060\u7d42\u4e86\u3057\u3066\u3044\u306a\u3044\u5834\u5408\u306b\u767a\u751f\u3059\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<h3>6. \u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u627f\u8a8d\u3092\u5f97\u3089\u308c\u305f\u5f8c\u3001\u6700\u5f8c\u306e <span class=\"text codecolorer\">rebase<\/span> \u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7\u3092\u884c\u3046<\/h3>\n<p>\u30ec\u30d3\u30e5\u30fc\u5f8c\u306f\u3001\u6a5f\u80fd\u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u306e\u6700\u7d42\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7\u3068\u6574\u7406\u3092\u884c\u3044\u3001\u95a2\u9023\u60c5\u5831\u3092\u63d0\u4f9b\u3057\u3066\u3044\u306a\u3044\u507d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u53d6\u308a\u9664\u304f\u3068\u3044\u3044\u3067\u3057\u3087\u3046\u3002\u3042\u306a\u305f\u306e\u30c1\u30fc\u30e0\u304c\u7d4c\u9a13\u8c4a\u5bcc\u3067\u5bfe\u5fdc\u3067\u304d\u308b\u306e\u3067\u3042\u308c\u3070\u3001\u958b\u767a\u4e2d\u306b <span class=\"text codecolorer\">rebase<\/span> \u3059\u308b\u4e8b\u3082\u53ef\u80fd\u3067\u3059\u3002\u3057\u304b\u3057\u3001\u79c1\u306f\u3053\u308c\u3092<strong>\u5168\u304f<\/strong>\u304a\u52e7\u3081\u3057\u307e\u305b\u3093\u3002<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git rebase -i origin\/master<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>(\u3053\u306e\u6642\u70b9\u3067\u3001\u767a\u884c\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u3092\u66f8\u304d\u63db\u3048\u3066\u304a\u308a\u3001\u307e\u305f\u4ed6\u306e\u8ab0\u3082\u304c\u3053\u308c\u306b\u5bfe\u3057\u3066\u30b3\u30df\u30c3\u30c8\u3057\u305f\u308a\u3001\u3053\u308c\u3092\u4f7f\u7528\u3057\u306a\u3044\u306e\u3067\u3042\u308c\u3070\u3001<span class=\"text codecolorer\">\u2013force<\/span> \u30d5\u30e9\u30b0\u3092\u5229\u7528\u3057\u3066\u3001\u5909\u66f4\u5185\u5bb9\u3092\u30d7\u30c3\u30b7\u30e5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093)<\/p>\n<h3>7. \u958b\u767a\u306e\u5b8c\u4e86\u5f8c\u306f\u3001\u660e\u793a\u7684\u306a\u30de\u30fc\u30b8\u3092\u8a18\u9332\u3059\u308b<\/h3>\n<p>\u6a5f\u80fd\u30d6\u30e9\u30f3\u30c1\u306e\u958b\u767a\u304c\u7d42\u4e86\u3057\u3001\u30ec\u30d3\u30e5\u30ef\u30fc\u304c\u3042\u306a\u305f\u306e\u4f5c\u696d\u5185\u5bb9\u3092\u30ec\u30d3\u30e5\u30fc\u3057\u305f\u5f8c\u306f\u3001<span class=\"text codecolorer\">\u2013no-ff<\/span>\u30d5\u30e9\u30b0\u3092\u4f7f\u7528\u3057\u3066<span class=\"text codecolorer\">merge<\/span> \u3057\u307e\u3059\u3002\u3053\u308c\u306b\u3088\u3063\u3066\u3001\u4f5c\u696d\u5185\u5bb9\u304c\u4fdd\u5b58\u3055\u308c\u3001\u5fc5\u8981\u306a\u5834\u5408\u306b\u306f\u7c21\u5358\u306b\u5168\u6a5f\u80fd\u3092\u5143\u306b\u623b\u3059\u4e8b\u3082\u3067\u304d\u307e\u3059\u3002\u4ee5\u4e0b\u306f\u3001\u305d\u306e\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/>2<br \/>3<br \/>4<br \/><\/div><\/td><td><div class=\"text codecolorer\">git checkout master<br \/>\r\ngit pull origin master<br \/>\r\n<br \/>\r\ngit merge --no-ff PRJ-123-awesome-feature<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u4e0a\u8a18\u30a2\u30c9\u30d0\u30a4\u30b9\u306b\u5f93\u3044\u3001<span class=\"text codecolorer\">rebase<\/span> \u3092\u4f7f\u7528\u3057\u3066\u6a5f\u80fd\u30d6\u30e9\u30f3\u30c1\u3092\u6700\u65b0\u72b6\u614b\u306b\u4fdd\u3063\u3066\u3044\u305f\u306e\u3067\u3042\u308c\u3070\u3001\u5b9f\u969b\u306e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306b\u306f\u4e00\u5207\u306e\u5909\u66f4\u304c\u542b\u307e\u308c\u307e\u305b\u3093\u3002\u3053\u308c\u306f\u7d20\u6674\u3089\u3057\u3044\u4e8b\u3067\u3059\uff01\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306f\u3001\u6a5f\u80fd\u30d6\u30e9\u30f3\u30c1\u306b\u95a2\u3059\u308b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3092\u4fdd\u7ba1\u3059\u308b\u3001\u5358\u306a\u308b\u30de\u30fc\u30ab\u30fc\u3068\u306a\u308a\u307e\u3059\u3002 \u8a73\u3057\u304f\u306f\u3001\u79c1\u306e\u6700\u65b0\u8a18\u4e8b\u3067\u3042\u308b<a href=\"http:\/\/blogs.atlassian.com\/2013\/10\/git-team-workflows-merge-or-rebase\/\">\u30de\u30fc\u30b8\u306e\u5b9f\u884c vs \u30ea\u30d9\u30fc\u30b9\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u304a\u3051\u308b\u826f\u3044\u70b9\u3068\u60aa\u3044\u70b9<\/a>\u3092\u53c2\u7167\u3057\u3066\u4e0b\u3055\u3044\u3002<\/p>\n<h3>\u30c8\u30b0\u30eb\u3059\u308b\u969b\u306b\u4fbf\u5229\u306a <span class=\"text codecolorer\">.gitconfig<\/span> \u30aa\u30d7\u30b7\u30e7\u30f3<\/h3>\n<p><span class=\"text codecolorer\">git<\/span> \u306b\u6307\u793a\u3092\u51fa\u3059\u4e8b\u3067\u3001\u3042\u3089\u3086\u308b<span class=\"text codecolorer\">pull<\/span> \u304c<span class=\"text codecolorer\">merge<\/span>\u306e\u4ee3\u308f\u308a\u306b<span class=\"text codecolorer\">rebase<\/span> \u3092\u4f7f\u7528\u3057\u3066\u3001\u305d\u306e\u9593\u3092\u4fdd\u5b58\u3059\u308b\u3088\u3046\u306b\u3067\u304d\u307e\u3059\u3002<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/>2<br \/><\/div><\/td><td><div class=\"text codecolorer\">git config --global branch.autosetuprebase always <br \/>\r\ngit config --global pull.rebase preserve #(this is a very recent and useful addition that appeared in git 1.8.5)<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u8ab0\u3057\u3082\u304c\u4e3b\u8981\u30b3\u30de\u30f3\u30c9\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u884c\u52d5\u3092\u5909\u66f4\u3057\u305f\u3044\u8a33\u3067\u306f\u7121\u3044\u306e\u3067\u3001\u305d\u308c\u304c\u3082\u305f\u3089\u3059\u5f71\u97ff\u3092\u3088\u304f\u628a\u63e1\u3057\u305f\u4e0a\u3067\u4e0a\u8a18\u3092\u53d6\u308a\u5165\u308c\u308b\u3079\u304d\u3067\u3057\u3087\u3046\u3002<a href=\"http:\/\/stackoverflow.com\/questions\/15915430\/what-exactly-does-gits-rebase-preserve-merges-do-and-why\">preserve merge \u306e\u8a73\u7d30\u306b\u95a2\u3057\u3066\u306f\u3001Stack Overflow \u3092\u53c2\u7167\u3057\u3066\u4e0b\u3055\u3044<\/a>\u3002<\/p>\n<h2>\u7d50\u8ad6<\/h2>\n<p>\u3053\u308c\u3067\u3001\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3001\u30d6\u30e9\u30f3\u30c1\u30e2\u30c7\u30eb\u3001\u305d\u3057\u3066\u30b3\u30fc\u30c9\u30b3\u30e9\u30dc\u30ec\u30fc\u30b7\u30e7\u30f3\u3067\u3067\u304d\u308b\u3053\u3068\u306b\u3064\u3044\u3066\u5341\u5206\u306a\u8cc7\u6599\u3068\u306a\u3063\u305f\u4e8b\u3067\u3057\u3087\u3046\u3002<span class=\"text codecolorer\">git<\/span> \u306b\u3064\u3044\u3066\u3082\u3063\u3068\u30af\u30fc\u30eb\u306a\u3053\u3068\u3092\u77e5\u308a\u305f\u3044\u5834\u5408\u306f\u3001<a href=\"http:\/\/twitter.com\/durdn\">@durdn<\/a> \u3067\u79c1\u3092\u3001\u305d\u3057\u3066 <a href=\"http:\/\/twitter.com\/AtlDevTools\">@AtlDevtools<\/a> \u30c1\u30fc\u30e0\u3092\u30d5\u30a9\u30ed\u30fc\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002<strong> \u8b1d\u8f9e:<\/strong> \u672c\u6295\u7a3f\u5185\u5bb9\u306f\u3001<a href=\"https:\/\/gist.github.com\/jbenet\/ee6c9ac48068889b0912\">\u7c21\u6f54\u304b\u3064\u512a\u308c\u305f gist<\/a>\u304b\u3089\u4e00\u90e8\u30a4\u30f3\u30b9\u30d4\u30ec\u30fc\u30b7\u30e7\u30f3\u3092\u53d7\u3051\u3066\u57f7\u7b46\u3057\u307e\u3057\u305f\u3002<\/p>\n<p><small><br \/>\n*\u672c\u30d6\u30ed\u30b0\u306f Atlassian Blogs \u306e\u7ffb\u8a33\u3067\u3059\u3002\u672c\u6587\u4e2d\u306e\u65e5\u6642\u306a\u3069\u306f\u6295\u7a3f\u5f53\u6642\u306e\u3082\u306e\u3067\u3059\u306e\u3067\u3054\u4e86\u627f\u304f\u3060\u3055\u3044\u3002<br \/>\n*\u539f\u6587 : 2014 \u5e74 2 \u6708 9 \u65e5 \"<a href=\"http:\/\/blogs.atlassian.com\/2014\/01\/simple-git-workflow-simple\/\" target=\"_blank\">Simple Git workflow is simple<\/a>\"<\/small><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u65e2\u306b\u591a\u304f\u306e\u30c1\u30fc\u30e0\u306f git \u3078\u306e\u79fb\u884c\u3092\u6e08\u307e\u305b\u3066\u304a\u308a\u3001\u307e\u305f\u66f4\u306b\u591a\u304f\u306e\u30c1\u30fc\u30e0\u304c\u73fe\u5728\u305d\u306e\u79fb\u884c\u6bb5\u968e\u306b\u3042\u308a\u307e\u3059\u3002\u4e00\u4eba\u306e\u30c7\u30d9\u30ed\u30c3\u30d1\u30fc\u3092\u8a13\u7df4\u3057\u3066\u3001\u63a1\u7528\u306e\u652f\u63f4\u3068\u3057\u3066 \u30c1\u30e3\u30f3\u30d4\u30aa\u30f3 \u3092\u4efb\u547d\u3059\u308b\u3053\u3068\u306f&hellip;<\/p>\n","protected":false},"author":275,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"bitbucket_subtitle":"","footnotes":""},"categories":[1],"tags":[554,103,264,106,202],"coauthors":[],"class_list":["post-2531","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-bitbucket","tag-git","tag-git-workflow","tag-stash","tag-202"],"acf":[],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/2531","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/users\/275"}],"replies":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/comments?post=2531"}],"version-history":[{"count":0,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/2531\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/media?parent=2531"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/categories?post=2531"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/tags?post=2531"},{"taxonomy":"author","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/coauthors?post=2531"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}