{"id":111,"date":"2014-06-04T08:25:20","date_gmt":"2014-06-03T23:25:20","guid":{"rendered":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/blog\/2014\/06\/04\/git-branch-model"},"modified":"2022-10-26T10:18:42","modified_gmt":"2022-10-26T01:18:42","slug":"git-branch-model","status":"publish","type":"post","link":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/blog\/2014\/06\/04\/git-branch-model\/","title":{"rendered":"Git\u306e\u30d6\u30e9\u30f3\u30c1\u904b\u7528\u3067\u3061\u3087\u3063\u3068\u8a66\u884c\u932f\u8aa4\u3057\u305f\u8a71"},"content":{"rendered":"<p>\u5148\u65e5\u306e\u5065\u5eb7\u8a3a\u65ad\u3067\u5373\u30e1\u30bf\u30dc\u8a8d\u5b9a\u3092\u53d7\u3051\u3066\u5371\u6a5f\u611f\u3092\u899a\u3048\u3001\u9152\u91cf\u3068\u98df\u4e8b\u91cf\u3092\u6e1b\u3089\u3057\u3064\u3064\u3042\u308a\u307e\u3059\u304c\u3001\u307e\u3060\u52b9\u679c\u304c\u8868\u308c\u3066\u3044\u306a\u3044\u4e0b\u689d\u3067\u3059\u3002\u3053\u306e\u30d6\u30ed\u30b0\u3067\u5b9a\u671f\u7684\u306b\u4f53\u91cd\u3092\u516c\u958b\u3059\u308c\u3070\u3055\u3089\u306b\u610f\u8b58\u304c\u5909\u308f\u308b\u304b\u306a\u3068\u601d\u3044\u307e\u3057\u305f\u304c\u3001\u7686\u3055\u3093\u305d\u3093\u306a\u3082\u306e\u306f\u898b\u305f\u304f\u306a\u3044\u3068\u601d\u3044\u307e\u3059\u306e\u3067\u66f8\u304d\u307e\u305b\u3093\u3002<\/p>\n<p>\u3055\u3066\u3001\u79c1\u306f\u4ee5\u524d\u306e\u4f1a\u793e\u3067\u306f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u306bSubversion\u7684\u306a\u3082\u306e\u3092\u4f7f\u3063\u3066\u304a\u308a\u3001\u5f0a\u793e\u306b\u5165\u793e\u3057\u3066\u304b\u3089\u672c\u683c\u7684\u306bGit\u3092\u4f7f\u3044\u51fa\u3057\u307e\u3057\u305f\u3002\u305d\u3053\u3067\u6700\u521d\u306b\u53c2\u52a0\u3057\u305f\u53d7\u8a17Web\u30b5\u30fc\u30d3\u30b9\u958b\u767a\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u304a\u3044\u3066\u3001Git\u3092\u4f7f\u3063\u305f\u30d6\u30e9\u30f3\u30c1\u904b\u7528\u306b\u3064\u3044\u3066\u3061\u3087\u3063\u3068\u8a66\u884c\u932f\u8aa4\u3057\u305f\u7d4c\u7def\u3092\u3054\u7d39\u4ecb\u3057\u307e\u3059\u3002<\/p>\n<h2 id=\"outline__1\" id=\"github-flow\u3068\u306e\u51fa\u4f1a\u3044\">GitHub Flow\u3068\u306e\u51fa\u4f1a\u3044<\/h2>\n<p>Git\u306e\u30d6\u30e9\u30f3\u30c1\u904b\u7528\u306e\u65b9\u6cd5\u3068\u3057\u3066\u6709\u540d\u306a\u3082\u306e\u3068\u3057\u3066\u3001<a href=\"https:\/\/gist.github.com\/Gab-km\/3705015\">GitHub Flow<\/a>\u3068<a href=\"http:\/\/nvie.com\/posts\/a-successful-git-branching-model\/\">A successful Git branching model<\/a> (<a href=\"http:\/\/keijinsonyaban.blogspot.jp\/2010\/10\/successful-git-branching-model.html\">O-Show \u6c0f\u306b\u3088\u308b\u65e5\u672c\u8a9e\u8a33<\/a>) \uff08\u4ee5\u5f8cgit-flow\u3068\u8a18\u8ff0\uff09\u306e2\u3064\u304c\u3042\u308a\u307e\u3059\u3002\u79c1\u304c\u5f0a\u793e\u306b\u5165\u793e\u3057\u3066Git\u3092\u4f7f\u3044\u59cb\u3081\u305f\u3068\u304d\u306f\u3001\u53d7\u8a17Web\u30b5\u30fc\u30d3\u30b9\u65b0\u898f\u958b\u767a\u306e\u307e\u3063\u305f\u3060\u4e2d\u3067\u3001\u307b\u307cGitHub Flow\u306b\u6e96\u3058\u305f\u30d5\u30ed\u30fc\u3068\u306a\u3063\u3066\u3044\u307e\u3057\u305f\u3002<br \/>\u4e00\u5fdcGitHub Flow\u306e\u6982\u8981\u3092\u66f8\u3044\u3066\u304a\u304d\u307e\u3059\u3002<\/p>\n<blockquote>\n<ul>\n<li>master\u30d6\u30e9\u30f3\u30c1\u306e\u3082\u306e\u306f\u4f55\u3067\u3042\u308c\u30c7\u30d7\u30ed\u30a4\u53ef\u80fd\u3067\u3042\u308b<\/li>\n<\/ul>\n<\/blockquote>\n<ul>\n<li>\u65b0\u3057\u3044\u4f55\u304b\u306b\u53d6\u308a\u7d44\u3080\u969b\u306f\u3001\u8aac\u660e\u7684\u306a\u540d\u524d\u306e\u30d6\u30e9\u30f3\u30c1\u3092master\u304b\u3089\u4f5c\u6210\u3059\u308b\uff08\u4f8b: new-oauth2-scopes\uff09<\/li>\n<li>\u4f5c\u6210\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u306b\u30ed\u30fc\u30ab\u30eb\u3067\u30b3\u30df\u30c3\u30c8\u3057\u3001\u30b5\u30fc\u30d0\u30fc\u4e0a\u306e\u540c\u3058\u540d\u524d\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u3082\u5b9a\u671f\u7684\u306b\u4f5c\u696d\u5185\u5bb9\u3092push\u3059\u308b<\/li>\n<li>\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3084\u52a9\u8a00\u304c\u6b32\u3057\u3044\u6642\u3001\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u3057\u3066\u3082\u3088\u3044\u3068\u601d\u3063\u305f\u3068\u304d\u306f\u3001 \u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8 \u3092\u4f5c\u6210\u3059\u308b<\/li>\n<li>\u4ed6\u306e\u8ab0\u304b\u304c\u30ec\u30d3\u30e5\u30fc\u3092\u3057\u3066\u6a5f\u80fd\u306bOK\u3092\u51fa\u3057\u3066\u304f\u308c\u305f\u3089\u3001\u3042\u306a\u305f\u306f\u30b3\u30fc\u30c9\u3092master\u3078\u30de\u30fc\u30b8\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b<\/li>\n<li>\u30de\u30fc\u30b8\u3092\u3057\u3066master\u3078push\u3057\u305f\u3089\u3001\u76f4\u3061\u306b\u30c7\u30d7\u30ed\u30a4\u3092\u3059\u308b<\/li>\n<\/ul>\n<p>\uff08<a href=\"https:\/\/gist.github.com\/Gab-km\/3705015\">https:\/\/gist.github.com\/Gab-km\/3705015<\/a> \u304b\u3089\u5f15\u7528\u3002\uff09<\/p>\n<p>\u3053\u306e\u30d5\u30ed\u30fc\u306f\u30b7\u30f3\u30d7\u30eb\u3067\u5206\u304b\u308a\u3084\u3059\u3044\u3067\u3059\u3002\u305d\u3057\u3066\u3001Pull Request\u3092\u5229\u7528\u3057\u3066\u30ec\u30d3\u30e5\u30fc\u3092\u30d7\u30ed\u30bb\u30b9\u306e\u4e2d\u306b\u7d44\u307f\u8fbc\u3093\u3060\u958b\u767a\u30d5\u30ed\u30fc\u3063\u3066\u306a\u304b\u306a\u304b\u3044\u3044\u306a\u3068\u601d\u3063\u3066\u3044\u307e\u3057\u305f\u3002\uff08\u5b9f\u969b\u306b\u306f\u30bd\u30fc\u30b9\u30ec\u30d3\u30e5\u30fc\u304c\u304d\u3061\u3093\u3068\u3055\u308c\u306a\u3044\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u3053\u308c\u307e\u3067\u305f\u304f\u3055\u3093\u898b\u3066\u304d\u305f\u306e\u3067\u3002\uff09<br \/>\u3053\u306e\u30d5\u30ed\u30fc\u306f\u3001\u958b\u767a\u6bb5\u968e\u3067\u306f\u57fa\u672c\u7684\u306b\u306f\u3046\u307e\u304f\u3044\u304f\u3068\u601d\u3044\u307e\u3059\u3057\u3001\u5b9f\u969b\u306b\u3046\u307e\u304f\u3044\u3063\u3066\u3044\u307e\u3057\u305f\u3002<\/p>\n<h2 id=\"outline__2\" id=\"github-flow\u3068\u306e\u5225\u308c\">GitHub Flow\u3068\u306e\u5225\u308c<\/h2>\n<p>\u30ea\u30ea\u30fc\u30b9\u5f8c\u306b\u904b\u7528\u30fb\u4fdd\u5b88\u958b\u767a\u30d5\u30a7\u30fc\u30ba\u306b\u5165\u308a\u3001\u6a5f\u80fd\u8ffd\u52a0\u30fb\u30d0\u30b0\u30d5\u30a3\u30c3\u30af\u30b9\u3092\u3059\u308b\u306b\u3042\u305f\u3063\u3066\u3001\u30d6\u30e9\u30f3\u30c1\u3092\u3069\u3046\u53d6\u308a\u6271\u3046\u304b\u3068\u3044\u3046\u3068\u3053\u308d\u3067GitHub Flow\u3067\u306f\u3046\u307e\u304f\u3044\u304b\u306a\u304f\u306a\u308a\u307e\u3057\u305f\u3002<br \/>\n\u307e\u305a\u3001\u305d\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u3001\u30ea\u30ea\u30fc\u30b9\u306b\u3064\u3044\u3066\u4ee5\u4e0b\u306e\u524d\u63d0\u6761\u4ef6\u304c\u3042\u308a\u307e\u3057\u305f\u3002\u3053\u306e\u30eb\u30fc\u30eb\u306f\u7279\u306b\u53d7\u8a17\u958b\u767a\u306b\u304a\u3044\u3066\u306f\u4f8b\u5916\u7684\u306a\u3082\u306e\u3067\u306f\u306a\u3044\u3068\u601d\u3044\u307e\u3059\u3002  <\/p>\n<ul>\n<li>\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u74b0\u5883\u3068\u672c\u756a\u74b0\u5883\u304c\u3042\u308a\u3001\u6a5f\u80fd\u8ffd\u52a0\u30fb\u4fee\u6b63\u306f\u304a\u5ba2\u69d8\u306eOK\u304c\u51fa\u305f\u3082\u306e\u304b\u3089\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u74b0\u5883\u3067\u52d5\u4f5c\u78ba\u8a8d\u3059\u308b\u3002<\/li>\n<li>\u3069\u306e\u6a5f\u80fd\u8ffd\u52a0\u30fb\u4fee\u6b63\u3092\u672c\u756a\u30ea\u30ea\u30fc\u30b9\u3059\u308b\u304b\u306f\u6700\u7d42\u7684\u306b\u304a\u5ba2\u69d8\u304c\u6c7a\u3081\u308b\u3002<\/li>\n<\/ul>\n<p>\u3053\u306e\u5834\u5408\u3001GitHub Flow\u306e\u3088\u3046\u306b\u968f\u6642master\u30d6\u30e9\u30f3\u30c1\u306bPull Request\u3057\u3066\u30de\u30fc\u30b8\u3057\u3066\u3044\u304f\u3068\u3001master\u30d6\u30e9\u30f3\u30c1\u306f\u672c\u756a\u74b0\u5883\u3068\u4e56\u96e2\u3057\u3066\u3044\u3063\u3066\u3057\u307e\u3044\u307e\u3059\u3002\u5373\u672c\u756a\u30ea\u30ea\u30fc\u30b9\u304c\u3067\u304d\u308b\u30d6\u30e9\u30f3\u30c1\u304c\u306a\u3044\u3068\u3044\u3046\u306e\u306f\u3044\u308d\u3044\u308d\u3068\u56f0\u308a\u307e\u3059\u3002\u7dca\u6025\u306e\u30d0\u30b0\u30d5\u30a3\u30c3\u30af\u30b9\u3092\u3057\u305f\u3044\u3068\u3044\u3046\u3068\u304d\u306a\u3069\u306b\u56f0\u308a\u307e\u3059\u3002\u307e\u305f\u3001\u5f8c\u304b\u3089\u3053\u308c\u3053\u308c\u306e\u4fee\u6b63\u306f\u30ea\u30ea\u30fc\u30b9\u3057\u306a\u3044\u306a\u3069\u3068\u8a00\u308f\u308c\u305f\u5834\u5408\u306bmaster\u30d6\u30e9\u30f3\u30c1\u304b\u3089\u30b3\u30df\u30c3\u30c8\u3092revert\u3057\u305f\u308a\u3059\u308b\u306e\u306f\u5acc\u306a\u3082\u306e\u3067\u3059\u3002\u7279\u306brevert\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u308a\u3059\u308b\u3068\u975e\u5e38\u306b\u5acc\u3067\u3059\u3002<br \/>\u7d50\u5c40\u3001\u4e0a\u8ff0\u3057\u305fURL\u306e\u4e2d\u306b\u3082\u8a18\u8f09\u3055\u308c\u3066\u3044\u308b\u901a\u308a\u3001GitHub Flow\u3067\u306f\u304d\u3061\u3093\u3068\u3057\u305f\u30ea\u30ea\u30fc\u30b9\u3068\u3044\u3046\u3082\u306e\u304c\u306a\u3044\u3053\u3068\u3092\u524d\u63d0\u3068\u3057\u3066\u3044\u307e\u3059\u3002\u3084\u306f\u308a\u3001\u30ea\u30ea\u30fc\u30b9\u304c\u5b58\u5728\u3059\u308b\u53d7\u8a17\u958b\u767a\u3067\u306e\u904b\u7528\u30fb\u4fdd\u5b88\u958b\u767a\u30d5\u30a7\u30fc\u30ba\u3084\u3001\u81ea\u793e\u306e\u5834\u5408\u3067\u3082\u30ea\u30ea\u30fc\u30b9\u306b\u306f\u8ab0\u304b\u306e\u627f\u8a8d\u304c\u3044\u308b\u3068\u3044\u3063\u305f\u5834\u5408\u306b\u306fGitHub Flow\u306f\u306a\u304b\u306a\u304b\u30de\u30c3\u30c1\u3057\u307e\u305b\u3093\u3002<br \/>\u3068\u3044\u3046\u308f\u3051\u3067\u3001\u4eca\u56de\u306e\u4e8b\u60c5\u306b\u5408\u308f\u305b\u305f\u3001\u65b0\u305f\u306aGit\u306e\u30d6\u30e9\u30f3\u30c1\u904b\u7528\u3092\u691c\u8a0e\u3059\u308b\u3053\u3068\u306b\u3057\u307e\u3057\u305f\u3002<\/p>\n<h2 id=\"outline__3\" id=\"\u65b0\u305f\u306a\u904b\u7528\u3092\u6a21\u7d22\u3057\u3066git-flow\u3092\u8abf\u67fb\">\u65b0\u305f\u306a\u904b\u7528\u3092\u6a21\u7d22\u3057\u3066git-flow\u3092\u8abf\u67fb<\/h2>\n<p>GitHub Flow\u304c\u30c0\u30e1\u3060\u3063\u305f\u3089git-flow\u304b\u306a\u3068\u3044\u3046\u3053\u3068\u3067git-flow\u3092\u8abf\u3079\u3066\u307f\u307e\u3057\u305f\u3002  <\/p>\n<p>git-flow\u3067\u306f5\u7a2e\u985e\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002<\/p>\n<blockquote>\n<ol>\n<li>develop\u30d6\u30e9\u30f3\u30c1<br \/>\n\u958b\u767a\u3092\u884c\u3046\u305f\u3081\u306e\u30d6\u30e9\u30f3\u30c1\u3002\u958b\u767a\u8005\u306f\u3001\u4e3b\u306b\u3053\u306e\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067\u4f5c\u696d\u3092\u884c\u3046\u3002\u6b21\u306b\u7d39\u4ecb\u3059\u308bfeature\u30d6\u30e9\u30f3\u30c1\u306a\u3069\u3001\u4ed6\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u884c\u3063\u305f\u4f5c\u696d\u306f\u3001\u3053\u3053\u306b\u30de\u30fc\u30b8\u3055\u308c\u308b<\/li>\n<li>feature\u30d6\u30e9\u30f3\u30c1<br \/>\n\u4e3b\u8981\u306a\u6a5f\u80fd\u3092\u5b9f\u88c5\u3059\u308b\u305f\u3081\u306e\u30d6\u30e9\u30f3\u30c1\u3002\u6a5f\u80fd\u306e\u5b9f\u88c5\u3084\u30d0\u30b0\u30d5\u30a3\u30c3\u30af\u30b9\u306a\u3069\u3001\u30bf\u30b9\u30af\u3054\u3068\u306bfeature\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u3001\u4f5c\u696d\u3092\u884c\u3046<\/li>\n<li>release\u30d6\u30e9\u30f3\u30c1<br \/>\n\u30ea\u30ea\u30fc\u30b9\u306e\u6e96\u5099\u3092\u884c\u3046\u305f\u3081\u306e\u30d6\u30e9\u30f3\u30c1\u3002\u30d7\u30ed\u30c0\u30af\u30c8\u3092\u30ea\u30ea\u30fc\u30b9\u3059\u308b\u524d\u306b\u3001\u3053\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u3001\u5fae\u8abf\u6574\u3092\u884c\u3046\u3002release\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u3067\u3001\u30ea\u30ea\u30fc\u30b9\u6e96\u5099\u3068\u6b21\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u5411\u3051\u305f\u958b\u767a\u306e\u30b3\u30fc\u30c9\u3092\u5206\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u308b<\/li>\n<li>master\u30d6\u30e9\u30f3\u30c1<br \/>\n\u30ea\u30ea\u30fc\u30b9\u3057\u305f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3092\u7ba1\u7406\u3059\u308b\u305f\u3081\u306e\u30d6\u30e9\u30f3\u30c1\u3002\u30ea\u30ea\u30fc\u30b9\u4f5c\u696d\u3092\u884c\u3046\u3068\u3001release\u30d6\u30e9\u30f3\u30c1\u306fmaster\u30d6\u30e9\u30f3\u30c1\u3078\u30de\u30fc\u30b8\u3055\u308c\u3066\u3001\u30ea\u30ea\u30fc\u30b9\u30bf\u30b0\u304c\u6253\u305f\u308c\u308b\u3002\u958b\u767a\u8005\u306f\u3001\u3053\u306e\u30d6\u30e9\u30f3\u30c1\u3078\u306e\u30b3\u30df\u30c3\u30c8\u306f\u884c\u308f\u306a\u3044<\/li>\n<li>hotfix\u30d6\u30e9\u30f3\u30c1<br \/>\n\u30ea\u30ea\u30fc\u30b9\u3055\u308c\u305f\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u306b\u7dca\u6025\u306e\u4fee\u6b63\u3092\u884c\u3046\u305f\u3081\u306e\u30d6\u30e9\u30f3\u30c1\u3002\u3053\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u306e\u4fee\u6b63\u5185\u5bb9\u306f\u3001\u3059\u3050\u306b\u30ea\u30ea\u30fc\u30b9\u3055\u308c\u308b\u306e\u3067\u3001hotfix\u30d6\u30e9\u30f3\u30c1\u306f\u30ea\u30ea\u30fc\u30b9\u3092\u7ba1\u7406\u3059\u308bmaster\u30d6\u30e9\u30f3\u30c1\u3078\u30de\u30fc\u30b8\u3055\u308c\u308b<\/li>\n<\/ol>\n<\/blockquote>\n<p>\uff08<a href=\"http:\/\/www.atmarkit.co.jp\/ait\/articles\/1311\/18\/news017.html\">http:\/\/www.atmarkit.co.jp\/ait\/articles\/1311\/18\/news017.html<\/a> \u304b\u3089\u5f15\u7528\u3002\uff09<\/p>\n<p>GitHub Flow\u306b\u6bd4\u3079\u308b\u3068\u304b\u306a\u308a\u3084\u3084\u3053\u3057\u3044\u904b\u7528\u3068\u306a\u308a\u307e\u3059\u3002\u4eca\u56de\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5834\u5408\u3001\u958b\u767a\u8005\u3082\u5c11\u306a\u3044\u3057\u3001\u6a5f\u80fd\u8ffd\u52a0\u30fb\u4fee\u6b63\u304c\u305d\u3053\u307e\u3067\u305f\u304f\u3055\u3093\u3042\u3063\u305f\u308f\u3051\u3067\u306f\u306a\u304b\u3063\u305f\u306e\u3067\u3001git-flow\u307b\u3069\u304c\u3093\u3070\u3063\u3066\u3084\u308b\u5fc5\u8981\u306f\u306a\u3044\u306e\u3067\u306f\u306a\u3044\u304b\u3068\u601d\u3044\u307e\u3057\u305f\u3002git-flow\u307b\u3069\u304c\u3093\u3070\u308a\u305f\u304f\u306f\u306a\u3044\u3051\u308c\u3069\u3082GitHub Flow\u3067\u306f\u8981\u4ef6\u3092\u6e80\u305f\u3055\u306a\u3044\u3068\u3044\u3063\u305f\u5834\u5408\u306b\u3069\u3046\u3044\u3063\u305f\u904b\u7528\u306b\u3059\u308b\u304b\u3068\u3044\u3046\u3053\u3068\u3067\u691c\u8a0e\u3057\u3001\u4f55\u56de\u304b\u306e\u8a66\u884c\u932f\u8aa4\u306e\u672b\u3001\u4ee5\u4e0b\u306e\u904b\u7528\u306b\u3059\u308b\u3053\u3068\u306b\u3057\u307e\u3057\u305f\u3002<\/p>\n<h2 id=\"outline__4\" id=\"\u63a1\u7528\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u904b\u7528\">\u63a1\u7528\u3057\u305f\u30d6\u30e9\u30f3\u30c1\u904b\u7528<\/h2>\n<p>master\u30d6\u30e9\u30f3\u30c1\u3001staging\u30d6\u30e9\u30f3\u30c1\u3068\u3044\u30462\u3064\u306e\u30e1\u30a4\u30f3\u30d6\u30e9\u30f3\u30c1\u3092\u4fdd\u6301\u3002<\/p>\n<ul>\n<li>master\u30d6\u30e9\u30f3\u30c1: \u30b5\u30fc\u30d3\u30b9\u3092\u30ea\u30ea\u30fc\u30b9\u3059\u308b\u305f\u3081\u306e\u30d6\u30e9\u30f3\u30c1\u3002\u5e38\u306b\u672c\u756a\u74b0\u5883\u3067\u52d5\u3044\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u3068\u306a\u308b\u3002\u30ea\u30ea\u30fc\u30b9\u3057\u305f\u3089\u30bf\u30b0\u3092\u4ed8\u3051\u308b\u3002<\/li>\n<li>staging\u30d6\u30e9\u30f3\u30c1: \u304a\u5ba2\u69d8\u304b\u3089\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3067\u306e\u691c\u8a3c\u8a31\u53ef\u304c\u51fa\u305f\u4fee\u6b63\u306e\u307f\u304c\u5165\u3063\u3066\u3044\u308b\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u691c\u8a3c\u7528\u30d6\u30e9\u30f3\u30c1\u3002\u672c\u756a\u30ea\u30ea\u30fc\u30b9\u306e\u8a31\u53ef\u304c\u51fa\u305f\u3089master\u3078\u30de\u30fc\u30b8\u3059\u308b\u3002<\/li>\n<\/ul>\n<p>\u5404\u958b\u767a\u8005\u306f\u6a5f\u80fd\u8ffd\u52a0\u30fb\u30d0\u30b0\u30d5\u30a3\u30c3\u30af\u30b9\u306b\u304a\u3044\u3066\u306f\u5168\u3066topic\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u3066\u958b\u767a\u3059\u308b\u3002<\/p>\n<ul>\n<li>topic\u30d6\u30e9\u30f3\u30c1\uff1a\u6a5f\u80fd\u306e\u8ffd\u52a0\u3001\u30d0\u30b0\u30d5\u30a3\u30c3\u30af\u30b9\u306a\u3069\u5168\u3066\u306e\u4f5c\u696d\u306fmaster\u304b\u3089\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u3063\u3066\u884c\u3046\u3002staging\u306b\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3001\u30ec\u30d3\u30e5\u30fc\u3059\u308b\u3002\u30ec\u30d3\u30e5\u30fc\u3067\u5168\u54e1\u306eOK\u304c\u51fa\u305f\u5f8c\u3001\u304a\u5ba2\u69d8\u304b\u3089\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u74b0\u5883\u3067\u306e\u691c\u8a3c\u8a31\u53ef\u304c\u51fa\u305f\u6642\u70b9\u3067staging\u306b\u30de\u30fc\u30b8\u3059\u308b\u3002<br \/>\ntopic\u30d6\u30e9\u30f3\u30c1\u306fmaster\u30de\u30fc\u30b8\u5f8c\u7834\u68c4\u3059\u308b\u3002<\/li>\n<\/ul>\n<p>\u2192\u304a\u304a\u3056\u3063\u3071\u306b\u8a00\u3046\u3068\u3001git-flow\u306ehotfix\u30d6\u30e9\u30f3\u30c1\u304a\u3088\u3073develop\u30d6\u30e9\u30f3\u30c1\u304c\u306a\u3044\u7c21\u6613\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u3088\u3046\u306a\u611f\u3058\u3067\u3059\u3002<\/p>\n<h4 id=\"outline__4_0_1\" id=\"hotfix\u30d6\u30e9\u30f3\u30c1\u304c\u306a\u3044\u7406\u7531\">hotfix\u30d6\u30e9\u30f3\u30c1\u304c\u306a\u3044\u7406\u7531<\/h4>\n<p>master\u304b\u3089\u5206\u5c90\u3057\u3001master\u306b\u30de\u30fc\u30b8\u3059\u308b\u3001hotfix\u30d6\u30e9\u30f3\u30c1\u306f\u4f5c\u6210\u3057\u307e\u305b\u3093\u3002\u3069\u3093\u306a\u4fee\u6b63\u3067\u3082\u3001\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u74b0\u5883\u3067\u304a\u5ba2\u69d8\u304c\u78ba\u8a8d\u3057\u305f\u5f8c\u306b\u672c\u756a\u30ea\u30ea\u30fc\u30b9\u3068\u3044\u3046\u30eb\u30fc\u30eb\u304c\u3042\u308b\u305f\u3081\u3001\u5fc5\u305a\u307e\u305astaging\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<h4 id=\"outline__4_0_2\" id=\"develop\u30d6\u30e9\u30f3\u30c1\u304c\u306a\u3044\u7406\u7531\">develop\u30d6\u30e9\u30f3\u30c1\u304c\u306a\u3044\u7406\u7531<\/h4>\n<p>\u3053\u3053\u306f\u3061\u3087\u3063\u3068\u5fae\u5999\u306a\u306e\u3067\u3059\u304c\u3001\u4fee\u6b63\u306e\u6570\u3001\u958b\u767a\u8005\u306e\u6570\u304c\u5c11\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u30ea\u30ea\u30fc\u30b9\u306e\u524d\u306btopic\u30d6\u30e9\u30f3\u30c1\u3092staging\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3059\u308c\u3070\u3088\u3044\u3068\u8003\u3048\u307e\u3057\u305f\u3002\u305d\u306e\u305f\u3081\u3001git-flow\u3067develop\u30d6\u30e9\u30f3\u30c1\u306b\u3042\u305f\u308b\u30d6\u30e9\u30f3\u30c1\u306f\u4f5c\u6210\u3057\u307e\u305b\u3093\u3067\u3057\u305f\u3002  <\/p>\n<p>\u305f\u3060\u3057\u3001\u3053\u306e\u904b\u7528\u306e\u554f\u984c\u70b9\u3068\u3057\u3066\u3001\u30ea\u30ea\u30fc\u30b9\u8a31\u53ef\u304c\u51fa\u305f\u6bb5\u968e\u3067staging\u30d6\u30e9\u30f3\u30c1\u306b\u4e00\u6c17\u306b\u591a\u304f\u306etopic\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u306a\u3044\u72b6\u6cc1\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002\u4e00\u6982\u306b\u306f\u8a00\u3048\u307e\u305b\u3093\u304c\u3001\u304a\u5ba2\u69d8\u306b\u306f\u4fee\u6b63\u81ea\u4f53\u306b\u304b\u304b\u308b\u30b3\u30b9\u30c8\u306f\u305d\u308c\u306a\u308a\u306b\u7406\u89e3\u3057\u3066\u3044\u305f\u3060\u3051\u308b\u3082\u306e\u3067\u3059\u304c\u3001\u30ea\u30ea\u30fc\u30b9\u6e96\u5099\u306e\u969b\u306b\u4fee\u6b63\u3092\u30de\u30fc\u30b8\u3059\u308b\u30b3\u30b9\u30c8\u3001\u30ea\u30b9\u30af\u306f\u306a\u304b\u306a\u304b\u7406\u89e3\u3057\u3066\u3044\u305f\u3060\u3051\u306a\u3044\u3082\u306e\u3067\u3059\u3002\u30ea\u30ea\u30fc\u30b9\u8a31\u53ef\u304c\u51fa\u305ftopic\u30d6\u30e9\u30f3\u30c1\u3092\u4e00\u6c17\u306bstaging\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3092\u3059\u308b\u3068\u3001\u4fee\u6b63\u540c\u58eb\u306e\u5f71\u97ff\u304c\u3069\u308c\u3060\u3051\u767a\u751f\u3059\u308b\u304b\u5206\u304b\u3089\u305a\u3001\u30ea\u30b9\u30af\u304c\u898b\u3048\u306a\u3044\u306e\u306f\u3088\u308d\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002<br \/>\u305d\u308c\u3092\u8003\u3048\u308b\u3068\u3001\u30ec\u30d3\u30e5\u30fc\u304c\u6e08\u3093\u3060topic\u30d6\u30e9\u30f3\u30c1\u306f\u3001\u3044\u3063\u305f\u3093\u306a\u3093\u3089\u304b\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3057\u3066\u304a\u304d\u3001\u4fee\u6b63\u540c\u58eb\u306e\u5f71\u97ff\u3092\u4e88\u3081\u628a\u63e1\u3057\u3066\u304a\u304f\u65b9\u304c\u3088\u3044\u3068\u3082\u601d\u3044\u307e\u3059\u3002<a href=\"http:\/\/daretoku-unix.blogspot.jp\/2014\/01\/git-flowgithub-flowgit.html\">git\u672c\u5bb6\u304c\u63a8\u5968\u3059\u308b\u30ef\u30fc\u30af\u30d5\u30ed\u30fc<\/a>\u306e\u4e2d\u3067\u3082\u300c\u4f7f\u3044\u6368\u3066\u306e\u7d71\u5408\u30d6\u30e9\u30f3\u30c1\u300d\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u304c\u63a8\u5968\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u305d\u3057\u3066\u3001\u30ea\u30ea\u30fc\u30b9\u304c\u8fd1\u304f\u306a\u3063\u305f\u3089topic\u30d6\u30e9\u30f3\u30c1\u3092staging\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3057\u3066\u30ea\u30ea\u30fc\u30b9\u306b\u5411\u3051\u305f\u8abf\u6574\u3092\u3059\u308b\u3068\u3002<br \/>\u305f\u3060\u3057\u3001\u4eca\u56de\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u5c0f\u3055\u304f\u3066\u30e1\u30f3\u30d0\u30fc\u3082\u5c11\u306a\u304f\u3001\u3042\u307e\u308a\u5927\u91cf\u306e\u4fee\u6b63\u304c\u5165\u308b\u3053\u3068\u3082\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u5404\u4fee\u6b63\u540c\u58eb\u306e\u5f71\u97ff\u304c\u898b\u3048\u308b\u3053\u3068\u304c\u307b\u3068\u3093\u3069\u3060\u3063\u305f\u305f\u3081\u306b\u3001\u4f7f\u3044\u6368\u3066\u306e\u7d71\u5408\u30d6\u30e9\u30f3\u30c1\u306f\u4f5c\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002<br \/>\u7d50\u679c\u3001git-flow\u3088\u308a\u3082\u3060\u3044\u3076\u7c21\u6613\u306a\u904b\u7528\u3068\u306a\u308a\u3001\u73fe\u72b6\u306f\u307e\u3042\u3046\u307e\u304f\u3044\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n<h2 id=\"outline__5\" id=\"\u307e\u3068\u3081\">\u307e\u3068\u3081<\/h2>\n<p>\u5f53\u7136\u3067\u306f\u3042\u308a\u307e\u3059\u304c\u3001\u5fc5\u305a\u3057\u3082GitHub Flow\u3084git-flow\u304c\u73fe\u5b9f\u3068\u30de\u30c3\u30c1\u3059\u308b\u3068\u306f\u9650\u308a\u307e\u305b\u3093\u3002GitHub Flow\u3084git-flow\u306f\u304a\u305d\u3089\u304f\u30d9\u30b9\u30c8\u30d7\u30e9\u30af\u30c6\u30a3\u30b9\u306e\u3088\u3046\u306a\u3082\u306e\u3067\u3059\u304c\u3001Git\u306e\u30d6\u30e9\u30f3\u30c1\u904b\u7528\u306f\u3001\u3042\u308b\u610f\u5473\u6c5a\u3044\u73fe\u5b9f\u306e\u958b\u767a\u30fb\u30ea\u30ea\u30fc\u30b9\u30d7\u30ed\u30bb\u30b9\u3068\u5bc6\u63a5\u306b\u7d61\u3093\u3067\u3044\u308b\u306e\u3067\u3001\u958b\u767a\u30fb\u30ea\u30ea\u30fc\u30b9\u30d7\u30ed\u30bb\u30b9\u3092\u542b\u3081\u306a\u304c\u3089\u3001\u305d\u306e\u90fd\u5ea6\u826f\u3044\u904b\u7528\u3092\u8003\u3048\u3066\u3044\u304f\u306e\u304c\u3088\u3044\u3068\u601d\u3044\u307e\u3059\u3002\u30c7\u30b6\u30a4\u30f3\u30d1\u30bf\u30fc\u30f3\u7684\u306a\u3082\u306e\u304c\u3042\u308c\u3070\u3046\u308c\u3057\u3044\u6c17\u306f\u3057\u3066\u3044\u307e\u3059\u304c\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5148\u65e5\u306e\u5065\u5eb7\u8a3a\u65ad\u3067\u5373\u30e1\u30bf\u30dc\u8a8d\u5b9a\u3092\u53d7\u3051\u3066\u5371\u6a5f\u611f\u3092\u899a\u3048\u3001\u9152\u91cf\u3068\u98df\u4e8b\u91cf\u3092\u6e1b\u3089\u3057\u3064\u3064\u3042\u308a\u307e\u3059\u304c\u3001\u307e\u3060\u52b9\u679c\u304c\u8868\u308c\u3066\u3044\u306a\u3044\u4e0b\u689d\u3067\u3059\u3002\u3053\u306e\u30d6\u30ed\u30b0\u3067\u5b9a\u671f\u7684\u306b\u4f53\u91cd\u3092\u516c\u958b\u3059\u308c\u3070\u3055\u3089\u306b\u610f\u8b58\u304c\u5909\u308f\u308b\u304b\u306a\u3068\u601d\u3044\u307e\u3057\u305f\u304c\u3001\u7686\u3055\u3093\u305d\u3093\u306a\u3082\u306e\u306f\u898b\u305f\u304f\u306a\u3044\u3068\u601d\u3044\u307e\u3059\u306e\u3067\u66f8\u304d\u307e\u305b\u3093\u3002 \u3055\u3066\u3001\u79c1\u306f\u4ee5\u524d\u306e\u4f1a\u793e\u3067\u306f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u306bSubversion\u7684\u306a\u3082\u306e\u3092\u4f7f\u3063\u3066\u304a\u308a\u3001\u5f0a\u793e\u306b\u5165\u793e\u3057\u3066\u304b\u3089\u672c\u683c\u7684\u306bGit\u3092\u4f7f\u3044\u51fa\u3057\u307e\u3057\u305f\u3002\u305d\u3053\u3067 [&hellip;]<\/p>\n","protected":false},"author":4,"featured_media":684,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[8],"tags":[99],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/wp\/v2\/posts\/111"}],"collection":[{"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/wp\/v2\/users\/4"}],"replies":[{"embeddable":true,"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/wp\/v2\/comments?post=111"}],"version-history":[{"count":1,"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/wp\/v2\/posts\/111\/revisions"}],"predecessor-version":[{"id":3379,"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/wp\/v2\/posts\/111\/revisions\/3379"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/"}],"wp:attachment":[{"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/wp\/v2\/media?parent=111"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/wp\/v2\/categories?post=111"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/p-corporate-blog-cms.mmmcorp.co.jp\/wp-json\/wp\/v2\/tags?post=111"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}