{"id":2481,"date":"2013-11-25T17:29:20","date_gmt":"2013-11-25T08:29:20","guid":{"rendered":"http:\/\/aatljapan.wpengine.com\/?p=2481"},"modified":"2013-11-25T17:47:29","modified_gmt":"2013-11-25T08:47:29","slug":"git-team-workflows-merge-or-rebase","status":"publish","type":"post","link":"https:\/\/www.atlassian.com\/ja\/blog\/git-team-workflows-merge-or-rebase","title":{"rendered":"Git \u30c1\u30fc\u30e0\u30ef\u30fc\u30af\u30d5\u30ed\u30fc: \u30de\u30fc\u30b8 (merge)\u3001\u305d\u308c\u3068\u3082\u30ea\u30d9\u30fc\u30b9 (rebase) ?"},"content":{"rendered":"<div class=\"postcontent\">\n<p>\u8cea\u554f\u306f\u7c21\u5358\u3067\u3059\u3002<a href=\"http:\/\/atlassian.com\/git\"><span class=\"text codecolorer\">git<\/span><\/a> \u3068 <a href=\"https:\/\/www.atlassian.com\/ja\/git\/workflows#!workflow-feature-branch\" target=\"_blank\"> \u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1 <\/a> \u3092\u5229\u7528\u3057\u3066\u3044\u308b\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u30c1\u30fc\u30e0\u306b\u3068\u3063\u3066\u3001\u5b8c\u4e86\u6e08\u307f\u306e\u4f5c\u696d\u3092\u958b\u767a\u306e\u30e1\u30a4\u30f3\u30e9\u30a4\u30f3\u306b\u53d6\u308a\u8fbc\u3080\u6700\u826f\u306e\u65b9\u6cd5\u306f\u4f55\u3067\u3057\u3087\u3046\u304b\uff1f\u3053\u308c\u306f\u3001\u78ba\u56fa\u305f\u308b\u610f\u898b\u3092\u6301\u3064\u4e21\u9663\u55b6\u306b\u3088\u3063\u3066\u7e70\u308a\u8fd4\u3057\u5c55\u958b\u3055\u308c\u3066\u3044\u308b\u8b70\u8ad6\u306e\u4e00\u3064\u3067\u3059\u304c\u3001\u3084\u306f\u308a\u8b70\u8ad6\u306b\u306f\u6700\u4f4e\u9650\u306e\u914d\u616e\u3092\u6301\u3063\u3066\u5bfe\u5fdc\u3057\u305f\u3044\u3082\u306e\u3067\u3059\u3002 (\u305d\u306e\u4ed6\u306e\u6fc0\u3057\u3044\u8b70\u8ad6\u306e\u4f8b\u3068\u3057\u3066\u306f\u3053\u308c\u304c\u3042\u308a\u307e\u3059: <a href=\"http:\/\/en.wikipedia.org\/wiki\/Internet\" target=\"_blank\">The Internet<\/a>)\u3002<\/p>\n<p>\u30ea\u30d9\u30fc\u30b9\u3092\u884c\u3063\u3066\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5c65\u6b74\u3092\u30d5\u30e9\u30c3\u30c8\u304b\u3064\u30af\u30ea\u30fc\u30f3\u306b\u4fdd\u3064\u3079\u304d\u3067\u3057\u3087\u3046\u304b\uff1f\u305d\u308c\u3068\u3082\u3001\u53ef\u8aad\u6027\u3068\u660e\u6670\u3055\u3092\u72a0\u7272\u306b\u3059\u308b\u4e8b\u3067\u30c8\u30ec\u30fc\u30b5\u30d3\u30ea\u30c6\u30a3\u3092\u5f97\u3089\u308c\u308b\u3001\u30de\u30fc\u30b8\u3092\u884c\u3046\u3079\u304d\u3067\u3057\u3087\u3046\u304b\uff1f( <a href=\"https:\/\/www.atlassian.com\/ja\/git\/tutorial\/git-branches#!merge\" target=\"_blank\">\u30d5\u30a1\u30b9\u30c8\u30d5\u30a9\u30ef\u30fc\u30c9<\/a> \u30de\u30fc\u30b8\u3092\u7981\u6b62\u3059\u308b\u306a\u3069\u3002)<\/p>\n<h2>\u8b70\u8ad6<\/h2>\n<p>\u3053\u306e\u30c8\u30d4\u30c3\u30af\u306f\u3001vim \u3068 Emacs \u3084 Linux \u3068 BSD \u307b\u3069\u307e\u3067\u306b\u306f\u6709\u540d\u306a\u8ad6\u4e89\u306e\u7684\u3068\u306f\u306a\u3063\u3066\u3044\u306a\u3044\u3082\u306e\u306e\u3001\u53cc\u65b9\u5171\u306b\u9060\u616e\u306a\u304f\u610f\u898b\u3092\u8ff0\u3079\u5408\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n<p><span class=\"text codecolorer\">all-things-git<\/span> \u306b\u5bfe\u3059\u308b\u79c1\u306e\u7d4c\u9a13\u7684\u306a\u5370\u8c61\u3068\u3057\u3066\u306f\u3001<strong>\u5e38\u306b\u30de\u30fc\u30b8\u3059\u308b<\/strong>\u30a2\u30d7\u30ed\u30fc\u30c1\u306e\u65b9\u304c\u82e5\u5e72\u30de\u30a4\u30f3\u30c9\u30b7\u30a7\u30a2\u304c\u5927\u304d\u3044\u6c17\u304c\u3057\u307e\u3059\u3002\u3057\u304b\u3057\u3001<strong>\u5e38\u306b\u30ea\u30d9\u30fc\u30b9\u3059\u308b<\/strong>\u30a2\u30d7\u30ed\u30fc\u30c1\u306e\u63f4\u8b77\u8005\u3082\u3001\u30aa\u30f3\u30e9\u30a4\u30f3\u4e0a\u3067\u304b\u306a\u308a\u7a4d\u6975\u7684\u306b\u610f\u898b\u3092\u8ff0\u3079\u3066\u3044\u307e\u3059\u3002\u4ee5\u4e0b\u306f\u305d\u306e\u4f8b\u3067\u3059\u3002<\/p>\n<ul>\n<li><a href=\"http:\/\/unethicalblogger.com\/2010\/04\/02\/a-rebase-based-workflow.html\">\u30ea\u30d9\u30fc\u30b9\u306b\u57fa\u3065\u304f\u30ef\u30fc\u30af\u30d5\u30ed\u30fc<\/a><\/li>\n<li><a href=\"http:\/\/randyfay.com\/content\/rebase-workflow-git\">Git \u5411\u3051\u30ea\u30d9\u30fc\u30b9\u30ef\u30fc\u30af\u30d5\u30ed\u30fc<\/a><\/li>\n<li><a href=\"http:\/\/mettadore.com\/analysis\/a-simple-git-rebase-workflow-explained\/\">\u7c21\u5358\u306a Git \u306e\u30ea\u30d9\u30fc\u30b9\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u89e3\u8aac<\/a><\/li>\n<li><a href=\"http:\/\/reinh.com\/blog\/2009\/03\/02\/a-git-workflow-for-agile-teams.html\">\u30a2\u30b8\u30e3\u30a4\u30eb\u30c1\u30fc\u30e0\u5411\u3051 Git \u30ef\u30fc\u30af\u30d5\u30ed\u30fc<\/a><\/li>\n<\/ul>\n<p>\u6b63\u76f4\u306a\u6240\u3001<strong>\u30ed\u30fc\u30ab\u30eb\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7\u3068\u3057\u3066\u306e\u30ea\u30d9\u30fc\u30b9<\/strong>\u3068<strong>\u30c1\u30fc\u30e0\u30dd\u30ea\u30b7\u30fc\u3068\u3057\u3066\u306e\u30ea\u30d9\u30fc\u30b9<\/strong>\u306f\u5225\u7269\u3067\u3042\u308b\u305f\u3081\u3001\u5e38\u306b\u30ea\u30d9\u30fc\u30b9 vs. \u5e38\u306b\u30de\u30fc\u30b8\u3068\u3044\u3046\u4e21\u9663\u55b6\u306e\u5bfe\u6c7a\u306f\u8a71\u304c\u3084\u3084\u3053\u3057\u3044\u306e\u3067\u3059\u3002<\/p>\n<h2>\u4f59\u8ac7: \u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u306e\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u306b\u304a\u3044\u3066\u306f\u6700\u9ad8\u306a\u3001<strong>\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7\u3068\u3057\u3066\u306e\u30ea\u30d9\u30fc\u30b9<\/strong><\/h2>\n<p><strong>\u30c1\u30fc\u30e0\u30dd\u30ea\u30b7\u30fc\u3068\u3057\u3066\u306e\u30ea\u30d9\u30fc\u30b9<\/strong>\u306f<strong>\u3001\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7\u3068\u3057\u3066\u306e\u30ea\u30d9\u30fc\u30b9<\/strong>\u3068\u306f\u7570\u306a\u308a\u307e\u3059\u3002 <strong>\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7\u3068\u3057\u3066\u306e\u30ea\u30d9\u30fc\u30b9<\/strong> \u306f\u3001<span class=\"text codecolorer\">git<\/span>\u306e\u5c02\u9580\u5bb6\u306e\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u30e9\u30a4\u30d5\u30b5\u30a4\u30af\u30eb\u306e\u5065\u5168\u306a\u4e00\u90e8\u3092\u69cb\u6210\u3057\u3066\u3044\u307e\u3059\u3002\u4ee5\u4e0b\u306b\u3001\u30ea\u30d9\u30fc\u30b9\u3092\u884c\u3046\u4e8b\u304c\u5408\u7406\u7684\u304b\u3064\u52b9\u679c\u7684\u3068\u306a\u308b\u5834\u5408\u3068\u306a\u3089\u306a\u3044\u5834\u5408\u306e\u3001\u3044\u304f\u3064\u304b\u306e\u30b7\u30ca\u30ea\u30aa\u3092\u89e3\u8aac\u3057\u307e\u3059\u3002<\/p>\n<ul>\n<li><strong>\u30ed\u30fc\u30ab\u30eb\u3067\u958b\u767a\u4e2d\u3002<\/strong> \u3042\u306a\u305f\u306f\u3001\u81ea\u5206\u306e\u4f5c\u696d\u3092\u8ab0\u3068\u3082\u5171\u6709\u3057\u3066\u3044\u307e\u305b\u3093\u3002\u3053\u306e\u6642\u70b9\u3067\u306f\u3001\u5c65\u6b74\u3092\u30af\u30ea\u30fc\u30f3\u306b\u4fdd\u3064\u305f\u3081\u306b\u306f\u30de\u30fc\u30b8\u3088\u308a\u3082\u30ea\u30d9\u30fc\u30b9\u3092\u512a\u5148\u3057\u305f\u65b9\u304c\u3088\u3044\u3067\u3057\u3087\u3046\u3002\u4eee\u306b\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u500b\u4eba\u7684\u306a\u30d5\u30a9\u30fc\u30af\u304c\u3042\u3063\u3066\u305d\u308c\u3092\u4ed6\u306e\u958b\u767a\u8005\u3068\u5171\u6709\u3057\u3066\u3044\u306a\u3044\u5834\u5408\u3001\u81ea\u5206\u306e\u30d5\u30a9\u30fc\u30af\u306b\u30d7\u30c3\u30b7\u30e5\u3057\u305f\u5f8c\u3067\u3082\u30ea\u30d9\u30fc\u30b9\u3067\u304d\u307e\u3059\u3002<\/li>\n<li><strong>\u30b3\u30fc\u30c9\u30ec\u30d3\u30e5\u30fc\u306e\u6e96\u5099\u304c\u6574\u3063\u3066\u3044\u308b\u3002<\/strong> \u3042\u306a\u305f\u306f\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u4f5c\u6210\u3057\u3066\u304a\u308a\u3001\u4ed6\u306e\u958b\u767a\u8005\u306f\u3042\u306a\u305f\u306e\u4f5c\u696d\u3092\u30ec\u30d3\u30e5\u30fc\u3057\u3066\u3001\u6050\u3089\u304f\u305d\u308c\u3092\u30ed\u30fc\u30ab\u30eb\u3067\u30ec\u30d3\u30e5\u30fc\u3059\u308b\u305f\u3081\u306b\u81ea\u5206\u305f\u3061\u306e\u30d5\u30a9\u30fc\u30af\u306b\u53d6\u3063\u3066\u304d\u3066\u3044\u308b\u5834\u5408\u3067\u3059\u3002\u3053\u306e\u6642\u70b9\u3067\u306f\u3001\u3042\u306a\u305f\u306f\u81ea\u8eab\u306e\u4f5c\u696d\u3092\u30ea\u30d9\u30fc\u30b9\u3059\u308b\u3079\u304d\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u300c\u30ea\u30ef\u30fc\u30af\u300d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u3066\u3001\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u3092\u66f4\u65b0\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u308c\u306f\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u30c8\u30ec\u30fc\u30b5\u30d3\u30ea\u30c6\u30a3\u306b\u8ca2\u732e\u3057\u3066\u3001\u4e0d\u616e\u306e\u5c65\u6b74\u7834\u640d\u3092\u9632\u6b62\u3057\u307e\u3059\u3002<\/li>\n<li><strong>\u30ec\u30d3\u30e5\u30fc\u306f\u7d42\u4e86\u3057\u3066\u3001\u30bf\u30fc\u30b2\u30c3\u30c8\u30d6\u30e9\u30f3\u30c1\u3078\u306e\u7d71\u5408\u306e\u6e96\u5099\u304c\u6574\u3063\u3066\u3044\u308b\u3002<\/strong> \u304a\u3081\u3067\u3068\u3046\u3054\u3056\u3044\u307e\u3059\uff01\u3053\u308c\u3067\u3001\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u3092\u524a\u9664\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u4ee5\u964d\u3001\u4ed6\u306e\u958b\u767a\u8005\u306f\u3053\u308c\u3089\u306e\u5909\u66f4\u70b9\u3092\u30d5\u30a7\u30c3\u30c1\u3057\u3066\u30de\u30fc\u30b8\u3059\u308b\u4e8b\u304c\u7121\u3044\u305f\u3081\u3001\u3053\u308c\u3092\u6a5f\u306b\u5c65\u6b74\u3092\u524a\u9664\u3057\u307e\u3057\u3087\u3046\u3002\u3053\u3053\u3067\u306f\u5c65\u6b74\u3092\u30ea\u30e9\u30a4\u30c8\u3057\u3066\u3001\u5143\u306e\u30b3\u30df\u30c3\u30c8\u3068\u3084\u3063\u304b\u3044\u306a\u300cpr \u30ea\u30ef\u30fc\u30af\u300d\u3068\u300c\u30de\u30fc\u30b8\u300d\u30b3\u30df\u30c3\u30c8\u3092\u3001\u91cd\u70b9\u306e\u304a\u304b\u308c\u305f\u5c11\u6570\u306e\u30b3\u30df\u30c3\u30c8\u306b\u53ce\u3081\u308b\u4e8b\u304c\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u3089\u30b3\u30df\u30c3\u30c8\u3078\u306e\u660e\u793a\u7684\u306a\u30de\u30fc\u30b8\u306e\u4f5c\u6210\u306f\u4efb\u610f\u3067\u3059\u304c\u3001\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u304b\u3089\u30de\u30b9\u30bf\u30fc\u3078\u306e\u9032\u884c\u3092\u8a18\u9332\u3057\u3066\u304f\u308c\u308b\u305f\u3081\u3001\u3084\u308b\u4fa1\u5024\u306f\u3042\u308a\u307e\u3059\u3002<\/li>\n<\/ul>\n<p>\u3053\u306e\u4ef6\u306b\u3064\u3044\u3066\u30cf\u30c3\u30ad\u30ea\u3055\u305b\u305f\u6240\u3067\u3001<strong>\u30dd\u30ea\u30b7\u30fc<\/strong>\u306b\u3064\u3044\u3066\u8a71\u3057\u307e\u3057\u3087\u3046\u3002\u79c1\u306f\u3053\u306e\u8b70\u8ad6\u306b\u5bfe\u3057\u3066\u30d0\u30e9\u30f3\u30b9\u306e\u53d6\u308c\u305f\u898b\u89e3\u3092\u4fdd\u3064\u3088\u3046\u5fc3\u304c\u3051\u308b\u3068\u5171\u306b\u3001Atlassian \u5185\u306b\u304a\u3051\u308b\u3053\u306e\u554f\u984c\u3078\u306e\u5bfe\u51e6\u6cd5\u3092\u7d39\u4ecb\u3057\u307e\u3059\u3002<\/p>\n<h2><strong>\u30ea\u30d9\u30fc\u30b9\u30c1\u30fc\u30e0\u30dd\u30ea\u30b7\u30fc<\/strong>: \u5b9a\u7fa9\u3001\u826f\u3044\u70b9\u3068\u60aa\u3044\u70b9<\/h2>\n<p>\u305d\u308c\u305e\u308c\u306e\u30c1\u30fc\u30e0\u306f\u7686\u7570\u306a\u308b\u305f\u3081\u4e00\u822c\u8ad6\u3092\u8ff0\u3079\u308b\u306e\u306f\u96e3\u3057\u3044\u3067\u3059\u304c\u3001\u3068\u308a\u3042\u3048\u305a\u53d6\u308a\u7d44\u3093\u3067\u307f\u306a\u3044\u4e8b\u306b\u306f\u59cb\u307e\u308a\u307e\u305b\u3093\u3002\u307e\u305a\u3001\u6b21\u306e\u30dd\u30ea\u30b7\u30fc\u3092\u4e00\u4f8b\u3068\u3057\u3066\u691c\u8a0e\u3057\u3066\u307f\u3066\u4e0b\u3055\u3044\u3002\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u306e\u958b\u767a\u304c\u5b8c\u4e86\u3057\u305f\u3089\u3001\u5168\u3066\u306e\u4f5c\u696d\u5185\u5bb9\u3092\u53ef\u80fd\u306a\u9650\u308a\u6700\u5c0f\u9650\u306e\u30b3\u30df\u30c3\u30c8\u6570\u306b\u307e\u3067\u30ea\u30d9\u30fc\u30b9\/<a href=\"http:\/\/git-scm.com\/book\/ja\/Git-%E3%81%AE%E3%81%95%E3%81%BE%E3%81%96%E3%81%BE%E3%81%AA%E3%83%84%E3%83%BC%E3%83%AB-%E6%AD%B4%E5%8F%B2%E3%81%AE%E6%9B%B8%E3%81%8D%E6%8F%9B%E3%81%88\" target=\"_blank\">\u878d\u5408<\/a> \u3057\u3066\u3001<strong>\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306e\u4f5c\u6210\u3092\u907f\u3051\u307e\u3059<\/strong>\u3002\u3053\u306e\u969b\u3001\u5909\u66f4\u70b9\u304c\u78ba\u5b9f\u306b<a href=\"https:\/\/www.atlassian.com\/ja\/git\/tutorial\/git-branches#!merge\" target=\"_blank\">\u30d5\u30a1\u30b9\u30c8\u30d5\u30a9\u30ef\u30fc\u30c9<\/a>\u3055\u308c\u308b\u304b\u3001\u3042\u308b\u3044\u306f\u305d\u308c\u3089\u306e\u30b3\u30df\u30c3\u30c8\u3092\u30bf\u30fc\u30b2\u30c3\u30c8\u30d6\u30e9\u30f3\u30c1\u306b\u5411\u3051\u3066 <a href=\"https:\/\/www.kernel.org\/pub\/software\/scm\/git\/docs\/git-cherry-pick.html\"><span class=\"text codecolorer\">cherry-pick<\/span><\/a>\u3057\u307e\u3059\u3002)<\/p>\n<p>\u4f5c\u696d\u304c\u307e\u3060\u9032\u884c\u4e2d\u3067\u3001\u4e0a\u6d41\u306e\u30bf\u30fc\u30b2\u30c3\u30c8\u30d6\u30e9\u30f3\u30c1\u306b\u5408\u308f\u305b\u3066\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u3092\u6700\u65b0\u306e\u72b6\u614b\u306b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u5834\u5408\u3001\u5c65\u6b74\u3092\u4e0a\u8fba\u3060\u3051\u306e\u30de\u30fc\u30b8\u3067\u6c5a\u3055\u306a\u3044\u70ba\u306b\u3082<span class=\"text codecolorer\">pull<\/span>\u307e\u305f\u306f <span class=\"text codecolorer\">merge<\/span>\u306e\u4ee3\u308f\u308a\u306b<span class=\"text codecolorer\">rebase<\/span>\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002<\/p>\n<h3>\u826f\u3044\u70b9<\/h3>\n<ul>\n<li>\u30b3\u30fc\u30c9\u5c65\u6b74\u306f\u3001\u30d5\u30e9\u30c3\u30c8\u304b\u3064\u53ef\u8aad\u306e\u307e\u307e\u306b\u306a\u308a\u307e\u3059\u3002\u30af\u30ea\u30fc\u30f3\u304b\u3064\u660e\u78ba\u306a\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306f\u3001\u30b3\u30fc\u30c9\u30b3\u30e1\u30f3\u30c8\u3001\u307e\u305f\u306f\u8ab2\u984c\u30c8\u30e9\u30c3\u30ab\u30fc\u3078\u306e\u30b3\u30e1\u30f3\u30c8\u7b49\u3068\u540c\u69d8\u306b\u30b3\u30fc\u30c9\u30d9\u30fc\u30b9\u306e\u6587\u66f8\u306e\u4e00\u90e8\u3092\u69cb\u6210\u3057\u3066\u3044\u307e\u3059\u3002\u3053\u306e\u305f\u3081\u3001\u5358\u4e00\u306e\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u307e\u305f\u306f\u30d0\u30b0\u4fee\u6b63\u306e\u305f\u3081\u306b\u76f8\u6bba\u3057\u3066\u3057\u307e\u3046\u300131\u306e\u5358\u4e00\u884c\u306e\u30b3\u30df\u30c3\u30c8\u3067\u5c65\u6b74\u3092\u6c5a\u3057\u3066\u3057\u307e\u308f\u306a\u3044\u4e8b\u304c\u91cd\u8981\u3067\u3059\u3002\u3053\u306e\u3088\u3046\u306a\u72b6\u6cc1\u306b\u304a\u3044\u3066\u306f\u3001\u30d0\u30b0\u307e\u305f\u306f\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u304c\u5c0e\u5165\u3055\u308c\u305f\u6642\u671f\u3068\u305d\u306e\u7406\u7531\u3092\u6c42\u3081\u3066\u5c65\u6b74\u3092\u9061\u3063\u3066\u63a2\u3057\u51fa\u3059\u884c\u70ba\u306f\u3001\u975e\u5e38\u306b\u96e3\u3057\u304f\u306a\u308a\u307e\u3059\u3002<\/li>\n<li>\u5358\u4e00\u306e\u30b3\u30df\u30c3\u30c8\u64cd\u4f5c\u304c\u7c21\u5358 (\u4f8b\u3001\u5143\u306b\u623b\u3059)\u3002<\/li>\n<\/ul>\n<h3>\u60aa\u3044\u70b9<\/h3>\n<ul>\n<li>\u5168\u3066\u306e\u958b\u767a\u5c65\u6b74\u3092\u5099\u3048\u305f\u5c65\u6b74\u30d6\u30e9\u30f3\u30c1\u3092\u4fdd\u6301\u3057\u3066\u304a\u304b\u306a\u3044\u9650\u308a\u3001\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u3092\u4e00\u63e1\u308a\u306e\u30b3\u30df\u30c3\u30c8\u306b\u307e\u3067\u878d\u5408\u3057\u3066\u3057\u307e\u3046\u3068\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u304c\u96a0\u308c\u3066\u3057\u307e\u3044\u307e\u3059\u3002<\/li>\n<li>\u8ab0\u304b\u304c\u30ea\u30d9\u30fc\u30b9\u3057\u3066\u3057\u307e\u3046\u3068\u3001\u305d\u306e\u4eba\u304c\u884c\u3063\u305f\u7d30\u304b\u3044\u5909\u66f4\u70b9\u3092\u78ba\u8a8d\u3067\u304d\u306a\u3044\u305f\u3081\u3001\u30ea\u30d9\u30fc\u30b9\u306f<a href=\"https:\/\/www.atlassian.com\/ja\/software\/stash\/overview\/pull-requests\" target=\"_blank\">\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8<\/a> \u3068\u4e0a\u624b\u304f\u5408\u3044\u307e\u305b\u3093(\u3064\u3044\u3067\u306b\u8ff0\u3079\u308b\u3068\u3001<a href=\"http:\/\/www.atlassian.com\/ja\/software\/stash\/overview\" target=\"_blank\">Stash<\/a> \u958b\u767a\u30c1\u30fc\u30e0\u5185\u3067\u306f\u3001\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u4e2d\u306b\u306f\u7d76\u5bfe\u306b\u30ea\u30d9\u30fc\u30b9\u3057\u306a\u3044\u4e8b\u304c\u30b3\u30f3\u30bb\u30f3\u30b5\u30b9\u3068\u306a\u3063\u3066\u3044\u307e\u3059\u3002)<\/li>\n<li>\u30ea\u30d9\u30fc\u30b9\u306b\u306f\u3001\u5371\u967a\u306a\u5834\u5408\u304c\u3042\u308a\u307e\u3059\uff01\u5171\u6709\u30d6\u30e9\u30f3\u30c1\u306e\u5c65\u6b74\u3092\u30ea\u30e9\u30a4\u30c8\u3059\u308b\u3068\u3001\u30c1\u30fc\u30e0\u30ef\u30fc\u30af\u304c\u5d29\u308c\u308b\u8981\u56e0\u3092\u4f5c\u3063\u3066\u3057\u307e\u3046\u306e\u3067\u3059\u3002\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u306e\u30b3\u30d4\u30fc\u4e0a\u3067\u30ea\u30d9\u30fc\u30b9\/\u878d\u5408\u3092\u884c\u3046\u4e8b\u3067\u3053\u306e\u554f\u984c\u306f\u8efd\u6e1b\u3067\u304d\u308b\u3082\u306e\u306e\u3001\u3053\u308c\u306f\u30ea\u30d9\u30fc\u30b9\u306e\u6271\u3044\u306b\u306f\u80fd\u529b\u3068\u6ce8\u610f\u529b\u304c\u8981\u6c42\u3055\u308c\u308b\u4e8b\u3092\u6697\u793a\u3057\u3066\u3044\u308b\u306e\u3067\u3059\u3002<\/li>\n<li>\u4f5c\u696d\u304c\u5897\u3048\u307e\u3059\u3002\u304a\u4f7f\u3044\u306e\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u3092\u6700\u65b0\u306e\u72b6\u614b\u306b\u4fdd\u3064\u305f\u3081\u306b\u30ea\u30d9\u30fc\u30b9\u3092\u5229\u7528\u3059\u308b\u5834\u5408\u3001\u985e\u4f3c\u3057\u305f\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u4f55\u5ea6\u3082\u7e70\u308a\u8fd4\u3057\u89e3\u6c7a\u3057\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 \u78ba\u304b\u306b\u3001<a href=\"https:\/\/www.kernel.org\/pub\/software\/scm\/git\/docs\/git-rerere.html\">rerere (reuse recorded resolutions)<\/a>\u304c\u53ef\u80fd\u306a\u5834\u5408\u3082\u3042\u308a\u307e\u3059\u304c\u3001\u3053\u3053\u3067\u306f<span class=\"text codecolorer\">merges<\/span>\u306b\u8ecd\u914d\u304c\u4e0a\u304c\u308a\u307e\u3059\u3002\u30de\u30fc\u30b8\u306a\u3089\u3070\u3001\u4e00\u5ea6\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6c7a\u3059\u308c\u3070\u5168\u3066\u5b8c\u4e86\u3067\u3059\u3002<\/li>\n<li>\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u3092\u4f7f\u7528\u3057\u3066\u30ea\u30d9\u30fc\u30b9\u3059\u308b\u4e8b\u306e\u3082\u3046\u4e00\u3064\u306e\u526f\u4f5c\u7528\u306f\u3001\u3042\u308b\u6642\u70b9\u3067<em>\u5f37\u5236\u7684\u306b\u30d7\u30c3\u30b7\u30e5<\/em>\u3057\u306a\u304f\u3066\u306f\u306a\u3089\u306a\u3044\u70b9\u306b\u3042\u308a\u307e\u3059\u3002\u4eca\u307e\u3067 Atlassian \u3067\u8d77\u304d\u305f\u6700\u5927\u306e\u554f\u984c\u306f\u3001\u7686\u304c\u5f37\u5236\u7684\u306b\u30d7\u30c3\u30b7\u30e5\u3057\u305f\u307e\u3067\u306f\u3088\u304b\u3063\u305f\u3051\u308c\u3069\u3082\u3001<span class=\"text codecolorer\">git push.default<\/span>\u3092\u8a2d\u5b9a\u3057\u3066\u3044\u306a\u3044\u3068\u3044\u3046\u70b9\u3067\u3057\u305f\u3002\u3053\u3046\u306a\u308b\u3068\u3001\u30ed\u30fc\u30ab\u30eb\u3068\u30ea\u30e2\u30fc\u30c8\u53cc\u65b9\u306b\u304a\u3051\u308b\u540c\u4e00\u540d\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u5168\u3066\u66f4\u65b0\u3055\u308c\u308b\u305f\u3081\u3001\u975e\u5e38\u306b<strong>\u7169\u308f\u3057\u3044<\/strong> \u72b6\u6cc1\u304c\u3082\u305f\u3089\u3055\u308c\u307e\u3059\u3002<\/li>\n<\/ul>\n<p><strong>\u6ce8: \u8907\u6570\u306e\u958b\u767a\u8005\u304c\u643a\u308f\u3063\u3066\u3044\u308b\u5171\u6709\u30d6\u30e9\u30f3\u30c1\u306b\u304a\u3044\u3066\u5c65\u6b74\u304c\u30ea\u30e9\u30a4\u30c8\u3055\u308c\u308b\u3068\u3001\u7834\u640d\u304c\u751f\u3058\u307e\u3059<\/strong>\u3002<\/p>\n<h2><strong>\u30de\u30fc\u30b8\u30c1\u30fc\u30e0\u30dd\u30ea\u30b7\u30fc<\/strong>: \u5b9a\u7fa9\u3001\u826f\u3044\u70b9\u3068\u60aa\u3044\u70b9<\/h2>\n<p><strong>\u9006\u306b\u3001\u5e38\u306b\u30de\u30fc\u30b8\u3059\u308b<\/strong>\u4e8b\u3092\u30d9\u30fc\u30b9\u306b\u3057\u305f\u30dd\u30ea\u30b7\u30fc\u306f\u6b21\u306e\u3088\u3046\u306a\u6d41\u308c\u306b\u306a\u308a\u307e\u3059\u3002\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u304c\u5b8c\u4e86\u3057\u305f\u3089\u3001\u30bf\u30fc\u30b2\u30c3\u30c8\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3057\u307e\u3059(<span class=\"text codecolorer\">master<\/span>\u307e\u305f\u306f<span class=\"text codecolorer\">develop<\/span>\u307e\u305f\u306f <span class=\"text codecolorer\">next<\/span>)\u3002<\/p>\n<p>\u5fc5\u305a\u3001\u30de\u30fc\u30b8\u306f<span class=\"text codecolorer\">\u2013no-ff<\/span>\u3067\u660e\u793a\u7684\u306b\u3057\u307e\u3059\u3002\u3053\u308c\u306b\u3088\u3063\u3066\u3001\u5909\u66f4\u70b9\u3092\u81ea\u52d5\u7684\u306b\u30bf\u30fc\u30b2\u30c3\u30c8\u30d6\u30e9\u30f3\u30c1\u306e\u4e0a\u306b\u30ea\u30d7\u30ec\u30a4\u3067\u304d\u308b\u5834\u5408\u3067\u3082\u3001<span class=\"text codecolorer\">git<\/span>\u306f\u5168\u3066\u306e\u30b1\u30fc\u30b9\u306b\u304a\u3044\u3066\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u8a18\u9332\u3059\u308b\u3088\u3046\u5f37\u5236\u3055\u308c\u307e\u3059\u3002<\/p>\n<h3>\u826f\u3044\u70b9<\/h3>\n<ul>\n<li>\u30c8\u30ec\u30fc\u30b5\u30d3\u30ea\u30c6\u30a3: \u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u306e\u6b74\u53f2\u306b\u95a2\u3059\u308b\u60c5\u5831\u3092\u4fdd\u6301\u3057\u3066\u3001\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u306e\u5168\u3066\u306e\u30b3\u30df\u30c3\u30c8\u90e8\u5206\u3092\u96c6\u5408\u5316\u3057\u307e\u3059\u3002<\/li>\n<\/ul>\n<h3>\u60aa\u3044\u70b9<\/h3>\n<ul>\n<li>\u5927\u91cf\u306e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306b\u3088\u3063\u3066\u5c65\u6b74\u304c\u6975\u5ea6\u306b\u6c5a\u3055\u308c\u3001\u307e\u305f\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u8996\u899a\u7684\u30c1\u30e3\u30fc\u30c8\u306b\u306f\u3055\u307b\u3069\u60c5\u5831\u3092\u8ffd\u52a0\u3057\u306a\u3044\u8679\u8272\u306e\u7dda\u304c\u8868\u793a\u3055\u308c\u3001\u4f55\u304c\u8d77\u304d\u3066\u3044\u308b\u306e\u304b\u304c\u5206\u304b\u308a\u3065\u3089\u304f\u306a\u308a\u307e\u3059\u3002(\u516c\u5e73\u306b\u8a00\u3048\u3070\u3001\u5c65\u6b74\u5185\u3092\u3069\u306e\u3088\u3046\u306b\u30ca\u30d3\u30b2\u30fc\u30c8\u3059\u308b\u304b\u3092\u628a\u63e1\u3057\u3066\u304a\u304f\u3060\u3051\u3067\u3001\u6df7\u4e71\u306f\u7c21\u5358\u306b\u89e3\u6c7a\u3067\u304d\u307e\u3059\u3002\u3053\u3053\u3067\u306e\u30dd\u30a4\u30f3\u30c8\u306f\u3001\u4f8b\u3048\u3070<span class=\"text codecolorer\">git log \u2013first-parent<\/span>\u3092\u5229\u7528\u3057\u3066\u3001\u4f55\u304c\u8d77\u304d\u305f\u304b\u3092\u7406\u89e3\u3059\u308b\u4e8b\u3067\u3059\u3002)<\/li>\n<\/ul>\n<p><a title=\"Git team workflows: merge or rebase?\" href=\"http:\/\/atlassian.wpengine.netdna-cdn.com\/wp-content\/uploads\/merge-trees-1-600x183.png\" rel=\"lightbox[26510]\"><img decoding=\"async\" class=\"alignnone size-large wp-image-24968\" alt=\"merge-1\" src=\"http:\/\/atlassian.wpengine.netdna-cdn.com\/wp-content\/uploads\/merge-trees-1-600x183.png\" \/><\/a><\/p>\n<ul>\n<li><span class=\"text codecolorer\">git bisect<\/span>\u3092\u5229\u7528\u3057\u305f\u30c7\u30d0\u30c3\u30b0\u306f\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306e\u305b\u3044\u3067\u975e\u5e38\u306b\u96e3\u3057\u304f\u306a\u308a\u307e\u3059\u3002<\/li>\n<\/ul>\n<h2>\u6c7a\u65ad\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002\u3042\u306a\u305f\u306b\u3068\u3063\u3066\u6700\u3082\u91cd\u8981\u306a\u3082\u306e\u306f\u4f55\u3067\u3057\u3087\u3046\u304b\uff1f<\/h2>\n<p>\u3069\u308c\u304c\u4e00\u756a\u826f\u3044\u306e\u3067\u3057\u3087\u3046\u304b\uff1f\u5c02\u9580\u5bb6\u306e\u304a\u52e7\u3081\u306f\u3069\u308c\u3067\u3057\u3087\u3046\u304b\uff1f<\/p>\n<p>\u3042\u306a\u305f\u81ea\u8eab\u3001\u3042\u308b\u3044\u306f\u3042\u306a\u305f\u306e\u30c1\u30fc\u30e0\u304c<span class=\"text codecolorer\">rebase<\/span>\u306e\u8907\u96d1\u3055\u306b\u6163\u308c\u3066\u3044\u306a\u3044\u304b\u3001\u3053\u308c\u3092\u7406\u89e3\u3067\u304d\u306a\u3044\u306e\u3067\u3042\u308c\u3070\u3001\u5229\u7528\u3057\u306a\u3044\u65b9\u304c\u61f8\u547d\u3067\u3057\u3087\u3046\u3002\u3053\u306e\u3088\u3046\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3067\u306f\u3001<strong>\u5e38\u306b\u30de\u30fc\u30b8\u3059\u308b<\/strong>\u304c\u6700\u3082\u5b89\u5168\u306a\u9078\u629e\u80a2\u3068\u306a\u308a\u307e\u3059\u3002<\/p>\n<p>\u3042\u306a\u305f\u81ea\u8eab\u3001\u304a\u3088\u3073\u3042\u306a\u305f\u306e\u30c1\u30fc\u30e0\u304c\u4e21\u65b9\u306e\u9078\u629e\u80a2\u306b\u6163\u308c\u89aa\u3057\u3093\u3067\u3044\u308b\u306e\u3067\u3042\u308c\u3070\u3001\u4ee5\u4e0b\u304c\u6c7a\u65ad\u306e\u30dd\u30a4\u30f3\u30c8\u3068\u306a\u308a\u307e\u3059\u3002<strong>\u91cd\u8996\u3059\u308b\u306e\u306f\u3001\u30af\u30ea\u30fc\u30f3\u3067\u30ea\u30cb\u30a2\u306a\u5c65\u6b74\u3067\u3059\u304b\uff1f\u305d\u308c\u3068\u3082\u3001\u30d6\u30e9\u30f3\u30c1\u306e\u30c8\u30ec\u30fc\u30b5\u30d3\u30ea\u30c6\u30a3\u3067\u3057\u3087\u3046\u304b\uff1f<\/strong>\u524d\u8005\u3067\u3042\u308c\u3070 <strong>\u30ea\u30d9\u30fc\u30b9<\/strong>\u30dd\u30ea\u30b7\u30fc\u3001\u5f8c\u8005\u3067\u3042\u308c\u3070<strong>\u30de\u30fc\u30b8<\/strong>\u30dd\u30ea\u30b7\u30fc\u3092\u9078\u3073\u307e\u3057\u3087\u3046\u3002<\/p>\n<p>\u307e\u305f\u3001\u30ea\u30d9\u30fc\u30b9\u30dd\u30ea\u30b7\u30fc\u306b\u306f\u5c11\u6570\u306e\u7981\u5fcc\u304c\u5b58\u5728\u3059\u308b\u305f\u3081\u3001\u3088\u308a\u591a\u304f\u306e\u624b\u9593\u304c\u8981\u6c42\u3055\u308c\u307e\u3059\u306e\u3067\u3054\u6ce8\u610f\u4e0b\u3055\u3044\u3002<\/p>\n<h3>\u30a2\u30c8\u30e9\u30b7\u30a2\u30f3\u306e\u30b1\u30fc\u30b9<\/h3>\n<p>\u30a2\u30c8\u30e9\u30b7\u30a2\u30f3\u306e <a href=\"http:\/\/www.atlassian.com\/ja\/software\/stash\/overview\" target=\"_blank\">Stash<\/a> \u30c1\u30fc\u30e0\u5185\u306b\u304a\u3044\u3066\u306f\u3001\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u3092\u5e38\u306b\u30de\u30fc\u30b8\u3059\u308b\u4e8b\u3001\u305d\u3057\u3066\u54c1\u8cea\u3068\u30b3\u30fc\u30c9\u30ec\u30d3\u30e5\u30fc\u306e\u305f\u3081\u306b\u30d6\u30e9\u30f3\u30c1\u306f<a title=\"https:\/\/www.atlassian.com\/software\/stash\/overview\/pull-requests\" href=\"https:\/\/www.atlassian.com\/ja\/software\/stash\/overview\/pull-requests\" target=\"_blank\">\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8<\/a> \u3092\u901a\u3058\u3066\u30de\u30fc\u30b8\u3055\u308c\u308b\u4e8b\u304c\u30dd\u30ea\u30b7\u30fc\u3068\u306a\u3063\u3066\u3044\u307e\u3059\u3002\u305f\u3060\u3057\u3001\u30c1\u30fc\u30e0\u306f\u30d5\u30a1\u30b9\u30c8\u30d5\u30a9\u30ef\u30fc\u30c9\u306b\u95a2\u3057\u3066\u306f\u3055\u307b\u3069\u53b3\u5bc6\u3067\u306f\u308a\u307e\u305b\u3093\u3002<\/p>\n<h3>\u7d50\u8ad6\u3068\u8b1d\u8f9e<\/h3>\n<p>\u672c\u8a18\u4e8b\u306f\u3001<a href=\"http:\/\/www.atlassian.com\/ja\/software\/stash\/overview\" target=\"_blank\">Stash<\/a> \u30c1\u30fc\u30e0\u3068\u306e\u6d1e\u5bdf\u529b\u6ea2\u308c\u308b\u3084\u308a\u3068\u308a\u306e <a href=\"https:\/\/www.atlassian.com\/ja\/software\/confluence\" target=\"_blank\">confluence (\u5408\u6d41)<\/a> \u306b\u3088\u3063\u3066\u53ef\u80fd\u3068\u306a\u308a\u307e\u3057\u305f\u3002<\/p>\n<p>\u3053\u306e\u8a18\u4e8b\u306b\u3088\u3063\u3066\u3053\u308c\u307e\u3067\u306e\u7591\u5ff5\u304c\u89e3\u6d88\u3055\u308c\u3001\u3042\u306a\u305f\u306e\u30c1\u30fc\u30e0\u306b\u9069\u3057\u305f\u30a2\u30d7\u30ed\u30fc\u30c1\u3092\u63a1\u7528\u3059\u308b\u304d\u3063\u304b\u3051\u3068\u306a\u308c\u3070\u5e78\u3044\u3067\u3059\u3002<span class=\"text codecolorer\">git <\/span>\u306e\u7d20\u6674\u3089\u3057\u3055\u3092\u3082\u3063\u3068\u77e5\u308a\u305f\u3044\u5834\u5408\u306f\u3001\u79c1 <a href=\"http:\/\/twitter.com\/durdn\">@durdn <\/a>\u3068\u3001\u7d20\u6674\u3089\u3057\u304d <a href=\"http:\/\/twitter.com\/AtlDevTools\">@AtlDevtools<\/a> \u30c1\u30fc\u30e0\u3092\u30d5\u30a9\u30ed\u30fc\u3057\u3066\u4e0b\u3055\u3044\u3002<\/p>\n<\/div>\n<p><!--\/postcontent--><\/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 : 2013 \u5e74 10 \u6708 28 \u65e5 \"<a href=\"http:\/\/blogs.atlassian.com\/2013\/10\/git-team-workflows-merge-or-rebase\/\" target=\"_blank\">Git team workflows: merge or rebase?<\/a>\"<br \/>\n<\/small><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u8cea\u554f\u306f\u7c21\u5358\u3067\u3059\u3002git \u3068 \u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1 \u3092\u5229\u7528\u3057\u3066\u3044\u308b\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u30c1\u30fc\u30e0\u306b\u3068\u3063\u3066\u3001\u5b8c\u4e86\u6e08\u307f\u306e\u4f5c\u696d\u3092\u958b\u767a\u306e\u30e1\u30a4\u30f3\u30e9\u30a4\u30f3\u306b\u53d6\u308a\u8fbc\u3080\u6700\u826f\u306e\u65b9\u6cd5\u306f\u4f55\u3067\u3057\u3087\u3046\u304b\uff1f\u3053\u308c\u306f\u3001\u78ba\u56fa\u305f\u308b\u610f&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":[177,103,328,329,330,332,333,331],"coauthors":[],"class_list":["post-2481","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-development-workflow","tag-git","tag-merge","tag-policy","tag-rebase","tag-332","tag-333","tag-331"],"acf":[],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/2481","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=2481"}],"version-history":[{"count":0,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/2481\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/media?parent=2481"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/categories?post=2481"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/tags?post=2481"},{"taxonomy":"author","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/coauthors?post=2481"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}