{"id":2832,"date":"2015-02-19T19:48:11","date_gmt":"2015-02-19T10:48:11","guid":{"rendered":"http:\/\/aatljapan.wpengine.com\/?p=2832"},"modified":"2015-07-14T15:27:26","modified_gmt":"2015-07-14T06:27:26","slug":"a-better-pull-request","status":"publish","type":"post","link":"https:\/\/www.atlassian.com\/ja\/blog\/a-better-pull-request","title":{"rendered":"\u3055\u3089\u306b\u512a\u308c\u305f \u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8"},"content":{"rendered":"<p>Git \u3092\u4f7f\u3063\u3066\u3044\u308b\u306a\u3089\u3070\u3001\u6050\u3089\u304f \u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8 \u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u3053\u3068\u3067\u3057\u3087\u3046\u3002\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306f\u3001DVCS \u306e\u9ece\u660e\u671f\u304b\u3089\u3001\u4f55\u304b\u3057\u3089\u306e\u5f62\u3067\u5b58\u5728\u3057\u3066\u304d\u307e\u3057\u305f\u3002Bitbucket \u3068 GitHub \u304c\u30aa\u30b7\u30e3\u30ec\u306a Web UI \u3092\u69cb\u7bc9\u3059\u308b\u4ee5\u524d\u3001\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3068\u8a00\u3048\u3070\u3001\u81ea\u5206\u306e\u30ea\u30dd\u3092\u5c11\u3057\u5909\u66f4\u3057\u3066\u307b\u3057\u3044\u3068\u3044\u3046\u53cb\u4eba\u306e\u30a2\u30ea\u30b9\u304b\u3089\u306e\u30e1\u30fc\u30eb\u306b\u3088\u308b\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u6307\u3057\u305f\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u305d\u3046\u3057\u3066\u3001\u554f\u984c\u306a\u3055\u305d\u3046\u3067\u3042\u308c\u3070\u3044\u304f\u3064\u304b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u3066\u3001<tt>master<\/tt> \u30d6\u30e9\u30f3\u30c1\u306b\u5909\u66f4\u5185\u5bb9\u3092\u30d7\u30eb\u3057\u307e\u3059:<\/p>\n<p><a href=\"http:\/\/aatljapan.wpengine.com\/files\/Screen-Shot-2015-02-16-at-12.14.10-PM-e1424056535543.png\"><img loading=\"lazy\" decoding=\"async\" class=\"aligncenter size-full wp-image-2835\" src=\"http:\/\/aatljapan.wpengine.com\/files\/Screen-Shot-2015-02-16-at-12.14.10-PM-e1424056535543.png\" alt=\"Screen Shot 2015-02-16 at 12.14.10 PM\" width=\"600\" height=\"64\" \/><\/a><\/p>\n<p>\u3082\u3061\u308d\u3093\u3001\u30a2\u30ea\u30b9\u306e\u5909\u66f4\u70b9\u3092\u30e9\u30f3\u30c0\u30e0\u306b <tt>master<\/tt> \u306b\u30d7\u30eb\u3059\u308b\u3060\u3051\u3067\u306f\u3001 <em>\u3042\u307e\u308a\u826f\u3044<\/em> \u30a2\u30a4\u30c7\u30a3\u30a2\u3068\u306f\u8a00\u3048\u307e\u305b\u3093\u3002<tt>master<\/tt> \u306f\u3001\u304a\u5ba2\u69d8\u306b\u51fa\u8377\u4e88\u5b9a\u306e\u30b3\u30fc\u30c9\u3092\u8868\u3057\u3066\u3044\u308b\u305f\u3081\u3001\u30de\u30fc\u30b8\u5185\u5bb9\u306b\u3064\u3044\u3066\u306f\u6ce8\u610f\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u3067\u3057\u3087\u3046\u3002<tt>master<\/tt> \u306b\u30d7\u30eb\u3059\u308b\u3088\u308a\u306f\u3001\u5225\u9014\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u30d7\u30eb\u30c0\u30a6\u30f3\u3057\u3066\u3001\u30de\u30fc\u30b8\u3059\u308b\u524d\u306b\u5909\u66f4\u5185\u5bb9\u3092\u8a73\u3057\u304f\u8abf\u3079\u308b\u65b9\u304c\u304a\u52e7\u3081\u3067\u3059:<\/p>\n<p><a href=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_121707_pm.png\"><img loading=\"lazy\" decoding=\"async\" class=\"aligncenter size-full wp-image-2837\" src=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_121707_pm.png\" alt=\"rsz_screen_shot_2015-02-16_at_121707_pm\" width=\"600\" height=\"43\" srcset=\"https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_121707_pm.png 600w, https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_121707_pm-300x22.png 300w\" sizes=\"auto, (max-width: 600px) 100vw, 600px\" \/><\/a><tt>git diff<\/tt> \u306e\u300c\u30c8\u30ea\u30d7\u30eb\u30c9\u30c3\u30c8\u300d\u69cb\u6587\u3092\u4f7f\u7528\u3059\u308b\u3068\u3001<tt>alice\/master<\/tt> \u306e\u5148\u7aef\u3068\u305d\u306e\u30de\u30fc\u30b8\u5143 (\u307e\u305f\u306f\u5171\u901a\u306e\u5148\u7956) \u3068\u3001\u79c1\u305f\u3061\u306e\u30ed\u30fc\u30ab\u30eb\u306e <tt>master<\/tt> \u30d6\u30e9\u30f3\u30c1\u3068\u306e\u5909\u66f4\u70b9\u3092\u793a\u3057\u3066\u304f\u308c\u307e\u3059\u3002\u3053\u3046\u3057\u3066\u3001\u30a2\u30ea\u30b9\u304c\u79c1\u305f\u3061\u306b\u30d7\u30eb\u3057\u3066\u307b\u3057\u3044\u3001\u5168\u3066\u306e\u5909\u66f4\u5185\u5bb9\u3092\u52b9\u679c\u7684\u306b\u793a\u3059\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<figure id=\"attachment_2834\" aria-describedby=\"caption-attachment-2834\" style=\"width: 600px\" class=\"wp-caption aligncenter\"><a href=\"http:\/\/aatljapan.wpengine.com\/files\/branch-diff-e1424058467667.png\"><img loading=\"lazy\" decoding=\"async\" class=\"size-full wp-image-2834\" src=\"http:\/\/aatljapan.wpengine.com\/files\/branch-diff-e1424058467667.png\" alt=\"git diff master...alice\/master \u306f\u3001git diff A B \u3068\u540c\u7b49\" width=\"600\" height=\"195\" \/><\/a><figcaption id=\"caption-attachment-2834\" class=\"wp-caption-text\">git diff master&#8230;alice\/master \u306f\u3001git diff A B \u3068\u540c\u7b49<\/figcaption><\/figure>\n<p>\u4e00\u898b\u3001\u3053\u308c\u306f\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u307e\u3064\u308f\u308b\u5909\u66f4\u5185\u5bb9\u3092\u30ec\u30d3\u30e5\u30fc\u3067\u304d\u308b\u3001\u5408\u7406\u7684\u306a\u65b9\u6cd5\u306e\u3088\u3046\u306b\u601d\u3048\u307e\u3059\u3002\u73fe\u306b\u66f8\u8fbc\u307f\u6642\u306b\u304a\u3044\u3066\u3001\u5927\u534a\u306e git \u30db\u30b9\u30c6\u30a3\u30f3\u30b0\u30c4\u30fc\u30eb\u306f\u3053\u306e\u65b9\u6cd5\u3092\u5229\u7528\u3057\u3066\u3001\u305d\u306e\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u6587\u66f8\u6bd4\u8f03\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0\u3092\u5b9f\u88c5\u3057\u3066\u3044\u308b\u3088\u3046\u3067\u3059\u3002<\/p>\n<p>\u3057\u304b\u3057\u3001\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u7528\u306b diff \u3092\u751f\u6210\u3059\u308b\u5834\u5408\u3001\u300c\u30c8\u30ea\u30d7\u30eb\u30c9\u30c3\u30c8\u300ddiff \u30a2\u30d7\u30ed\u30fc\u30c1\u3092\u4f7f\u7528\u3059\u308b\u3068\u3044\u304f\u3064\u304b\u306e\u554f\u984c\u304c\u751f\u3058\u307e\u3059\u3002\u5b9f\u969b\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u3001<tt>master<\/tt> \u30d6\u30e9\u30f3\u30c1\u306f\u4efb\u610f\u306e <tt>feature<\/tt> \u30d6\u30e9\u30f3\u30c1\u304b\u3089\u8457\u3057\u304f\u5206\u5c90\u3057\u307e\u3059\u3002\u4ed6\u306e\u30c7\u30d9\u30ed\u30c3\u30d1\u30fc\u3082\u3001\u81ea\u5206\u305f\u3061\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u696d\u3057\u3066\u3001\u305d\u308c\u3092 <tt>master<\/tt> \u306b\u30de\u30fc\u30b8\u3059\u308b\u308f\u3051\u3067\u3059\u3002\u4e00\u65e6 <tt>master<\/tt> \u304c\u9032\u5c55\u3059\u308b\u3068\u3001<tt>feature<\/tt> \u30d6\u30e9\u30f3\u30c1\u306e\u5148\u7aef\u304b\u3089\u30de\u30fc\u30b8\u5143\u307e\u3067\u306e\u5358\u7d14\u306a <tt>git diff<\/tt> \u3067\u306f\u3001\u3082\u306f\u3084\u4e21\u8005\u306e\u9593\u306b\u3042\u308b\u5b9f\u969b\u306e\u5dee\u5206\u3092\u9069\u5207\u306b\u793a\u3057\u305f\u3082\u306e\u306b\u306f\u306a\u308a\u307e\u305b\u3093\u3002\u3053\u3053\u3067\u898b\u3066\u3044\u308b\u306e\u306f\u3001\u5358\u306b\u30d6\u30e9\u30f3\u30c1\u306e\u5148\u7aef\u3068 <tt>master<\/tt> \u306e\u53e4\u3044\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u5dee\u5206\u306b\u904e\u304e\u306a\u3044\u306e\u3067\u3059\u3002<\/p>\n<figure id=\"attachment_2844\" aria-describedby=\"caption-attachment-2844\" style=\"width: 600px\" class=\"wp-caption aligncenter\"><a href=\"http:\/\/aatljapan.wpengine.com\/files\/triple-dot-diff-missing-1-e1424148867702.png\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-2844 size-full\" src=\"http:\/\/aatljapan.wpengine.com\/files\/triple-dot-diff-missing-1-e1424148867702.png\" alt=\"triple-dot-diff-missing (1)\" width=\"600\" height=\"236\" \/><\/a><figcaption id=\"caption-attachment-2844\" class=\"wp-caption-text\">\u300c\u30c8\u30ea\u30d7\u30eb\u30c9\u30c3\u30c8\u300d <span class=\"mono\">git diff master&#8230;alice\/master<\/span> \u306f\u3001master \u3078\u306e\u5909\u66f4\u5185\u5bb9\u3092\u8003\u616e\u3057\u306a\u3044<\/figcaption><\/figure>\n<p>&nbsp;<\/p>\n<p>\u3053\u308c\u3089\u306e\u5909\u66f4\u5185\u5bb9\u3092\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8 diff \u3067\u898b\u308c\u306a\u3044\u4e8b\u304c\u3001\u306a\u305c\u554f\u984c\u306a\u306e\u3067\u3057\u3087\u3046\u304b\u3002\u305d\u306e\u7406\u7531\u306f\u3001\uff12\u3064\u3042\u308a\u307e\u3059\u3002<\/p>\n<h2 id=\"merge-conflicts\">\u30de\u30fc\u30b8\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8<\/h2>\n<p>\uff11\u3064\u76ee\u306e\u554f\u984c\u306f\u3001\u6bd4\u8f03\u7684\u666e\u6bb5\u304b\u3089\u906d\u9047\u3059\u308b\u3082\u306e\u3001\u5373\u3061<strong>\u30de\u30fc\u30b8\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8<\/strong>\u3067\u3059\u3002<tt>master<\/tt> \u4e0a\u3067\u3082\u4fee\u6b63\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u3001\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067\u3082\u4fee\u6b63\u3057\u305f\u5834\u5408\u3001<tt>git diff<\/tt> \u306f\u3042\u306a\u305f\u306e\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067\u884c\u308f\u308c\u305f\u5909\u66f4\u5185\u5bb9\u3092\u5f15\u304d\u7d9a\u304d\u793a\u3057\u3066\u304f\u308c\u307e\u3059\u3002\u4ed6\u65b9\u3001<tt>git merge<\/tt> \u306f\u30a8\u30e9\u30fc\u3092\u5410\u304d\u51fa\u3057\u3066\u3001\u30ef\u30fc\u30ad\u30f3\u30b0\u30b3\u30d4\u30fc\u4e0a\u306e\u3042\u3089\u3086\u308b\u7b87\u6240\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u3092\u307e\u304d\u6563\u3089\u3057\u3001\u3042\u306a\u305f\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u4e00\u81f4\u4e0d\u80fd\u306a\u5dee\u5206\u304c\u5b58\u5728\u3059\u308b\u3068\u8868\u793a\u3057\u307e\u3059\u3002\u3053\u308c\u306f\u3001\u5c11\u306a\u304f\u3068\u3082 git \u306e\u6d17\u7df4\u3055\u308c\u305f\u30de\u30fc\u30b8\u6226\u7565\u306e\u8a31\u5bb9\u7bc4\u56f2\u3092\u8d85\u3048\u305f\u3082\u306e\u3060\u3068\u8a00\u3048\u308b\u3067\u3057\u3087\u3046\u3002<br \/>\n<a href=\"http:\/\/aatljapan.wpengine.com\/files\/merge-conflict-e1424149032921.png\"><img loading=\"lazy\" decoding=\"async\" class=\"aligncenter size-full wp-image-2845\" src=\"http:\/\/aatljapan.wpengine.com\/files\/merge-conflict-e1424149032921.png\" alt=\"merge-conflict\" width=\"600\" height=\"225\" \/><\/a><br \/>\n\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6c7a\u3092 <em>\u697d\u3057\u3080<\/em> \u4eba\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u304c\u3001\u3053\u308c\u306f\u3082\u306f\u3084\u5168\u3066\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u306b\u3068\u3063\u3066\u65e5\u5e38\u7684\u306a\u73fe\u5b9f\u3068\u306a\u3063\u3066\u3044\u307e\u3059\u3002\u3053\u306e\u5834\u5408\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u3068\u3044\u3046\u306e\u306f\u3001\u5c11\u306a\u304f\u3068\u3082\u30d5\u30a1\u30a4\u30eb\u30ec\u30d9\u30eb\u306e\u30ed\u30c3\u30af (\u3053\u308c\u306b\u306f\u56fa\u6709\u306e\u554f\u984c\u304c\u3042\u308a) \u306b\u5bfe\u5fdc\u3057\u3066\u3044\u306a\u3044\u3082\u306e\u3092\u6307\u3057\u307e\u3059\u3002<\/p>\n<p>\u305f\u3060\u3057\u3001\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u7528\u306b\u300c\u30c8\u30ea\u30d7\u30eb\u30c9\u30c3\u30c8\u300d<tt>git diff<\/tt> \u3092\u4f7f\u7528\u3057\u305f\u969b\u306b\u76f4\u9762\u3059\u308b\u304b\u3082\u3057\u308c\u306a\u3044\u3001\u3082\u3046\u4e00\u3064\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3068\u6bd4\u3079\u308c\u3070\u3001\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u65b9\u304c\u9065\u304b\u306b\u597d\u307e\u308c\u308b\u50be\u5411\u306b\u3042\u308a\u307e\u3059\u3002\u3053\u306e\u7279\u6b8a\u306a\u985e\u3044\u306e<em>\u8ad6\u7406<\/em>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306f\u7dba\u9e97\u306b\u30de\u30fc\u30b8\u3059\u308b\u3082\u306e\u306e\u3001\u3042\u306a\u305f\u306e\u30b3\u30fc\u30c9\u30d9\u30fc\u30b9\u306b\u5fae\u5999\u306a\u30d0\u30b0\u3092\u53d6\u308a\u8fbc\u3080\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<h2 id=\"logical-conflicts-that-merge-cleanly\">\u7dba\u9e97\u306b\u30de\u30fc\u30b8\u3059\u308b\u8ad6\u7406\u30b3\u30f3\u30d5\u30ea\u30af\u30c8<\/h2>\n<p>\u30c7\u30d9\u30ed\u30c3\u30d1\u30fc\u304c\u3001\u540c\u4e00\u30d5\u30a1\u30a4\u30eb\u306e\u7570\u306a\u308b\u7b87\u6240\u3092\u7570\u306a\u308b\u30d6\u30e9\u30f3\u30c1\u3067\u4fee\u6b63\u3057\u305f\u5834\u5408\u3001\u554f\u984c\u3092\u62b1\u3048\u308b\u3053\u3068\u306b\u306a\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u72ec\u7acb\u3057\u3066\u52d5\u4f5c\u3057\u3001<em>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u7121\u3057<\/em> \u306b\u4e0a\u624b\u304f\u30de\u30fc\u30b8\u3057\u305f\u3088\u3046\u306b\u898b\u3048\u308b\u7570\u306a\u308b\u5909\u66f4\u70b9\u304c\u3001\u5b9f\u306f\u7d44\u307f\u5408\u308f\u3055\u308b\u3068\u8ad6\u7406\u30d0\u30b0\u3092\u4f5c\u308a\u51fa\u3059\u3068\u3044\u3046\u30b1\u30fc\u30b9\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<p>\u3053\u308c\u306f\u3044\u304f\u3064\u304b\u306e\u65b9\u6cd5\u3092\u3068\u308a\u307e\u3059\u304c\u3001\u4e8c\u4eba\u4ee5\u4e0a\u306e\u30c7\u30d9\u30ed\u30c3\u30d1\u30fc\u304c\u3001\u7570\u306a\u308b\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067\u5076\u7136\u306b\u3082\u540c\u3058\u30d0\u30b0\u306b\u6c17\u4ed8\u3044\u3066\u3053\u308c\u3092\u4fee\u6b63\u3059\u308b\u3068\u3044\u3046\u306e\u306f\u3088\u304f\u3042\u308b\u30b1\u30fc\u30b9\u3067\u3059\u3002<br \/>\n\u822a\u7a7a\u5238\u306e\u4fa1\u683c\u3092\u8a08\u7b97\u3059\u308b\u305f\u3081\u306e\u4ee5\u4e0b\u306e JavaScript \u3092\u8003\u5bdf\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n<p><a href=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_123602_pm.png\"><img loading=\"lazy\" decoding=\"async\" class=\"aligncenter size-full wp-image-2838\" src=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_123602_pm.png\" alt=\"rsz_screen_shot_2015-02-16_at_123602_pm\" width=\"600\" height=\"175\" srcset=\"https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_123602_pm.png 600w, https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_123602_pm-300x88.png 300w\" sizes=\"auto, (max-width: 600px) 100vw, 600px\" \/><\/a><\/p>\n<p>\u3053\u3053\u306b\u306f\u3001\u660e\u3089\u304b\u306b\u30d0\u30b0\u304c\u5b58\u5728\u3057\u307e\u3059\u3002\u4f5c\u6210\u8005\u306f\u3001\u8a08\u7b97\u5f0f\u306b\u901a\u95a2\u624b\u6570\u6599\u3092\u542b\u3081\u308b\u306e\u3092\u5fd8\u308c\u3066\u3044\u307e\u3059\u306d\uff01<\/p>\n<p>\u3053\u3053\u3067\u3001\u4e8c\u4eba\u306e\u30c7\u30d9\u30ed\u30c3\u30d1\u30fc\u3001\u30a2\u30ea\u30b9\u3068\u30dc\u30d6\u304c\u3001\u305d\u308c\u305e\u308c\u3053\u306e\u30d0\u30b0\u306b\u6c17\u4ed8\u3044\u3066\u30012\u3064\u306e\u7570\u306a\u308b\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067\u500b\u5225\u306b\u4fee\u6b63\u3057\u305f\u3068\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n<p>\u30a2\u30ea\u30b9\u306f\u3001<tt>immigrationFee<\/tt> \u306e\u524d\u306b <tt>customsFee<\/tt> \u3092\u52a0\u3048\u307e\u3059:<\/p>\n<p><a href=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_123820_pm.png\"><img loading=\"lazy\" decoding=\"async\" class=\"aligncenter size-full wp-image-2839\" src=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_123820_pm.png\" alt=\"rsz_screen_shot_2015-02-16_at_123820_pm\" width=\"600\" height=\"116\" srcset=\"https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_123820_pm.png 600w, https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_123820_pm-300x58.png 300w\" sizes=\"auto, (max-width: 600px) 100vw, 600px\" \/><\/a><\/p>\n<p>\u305d\u3057\u3066\u3001\u30dc\u30d6\u3082\u4f3c\u305f\u3088\u3046\u306a\u4fee\u6b63\u3092\u884c\u3044\u307e\u3059\u304c\u3001<tt>immigrationFee<\/tt> \u306e\u884c\u306e\u5f8c\u306b\u52a0\u3048\u307e\u3059:<\/p>\n<p><a href=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_124040_pm.png\"><img loading=\"lazy\" decoding=\"async\" class=\"aligncenter size-full wp-image-2840\" src=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_124040_pm.png\" alt=\"rsz_screen_shot_2015-02-16_at_124040_pm\" width=\"600\" height=\"115\" srcset=\"https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_124040_pm.png 600w, https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_124040_pm-300x58.png 300w\" sizes=\"auto, (max-width: 600px) 100vw, 600px\" \/><\/a><\/p>\n<p>\u5404\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067\u7570\u306a\u308b\u884c\u304c\u4fee\u6b63\u3055\u308c\u305f\u305f\u3081\u3001\u3053\u306e 2 \u3064\u306e\u30d6\u30e9\u30f3\u30c1\u306f\u4e21\u65b9\u3068\u3082\u30011 \u3064\u307e\u305f 1 \u3064\u3068 <tt>master<\/tt> \u306b\u7dba\u9e97\u306b\u30de\u30fc\u30b8\u3055\u308c\u3066\u3044\u304d\u307e\u3059\u3002\u3057\u304b\u3057\u3001\u3053\u308c\u3067\u306f <tt>master<\/tt> \u304c <em>\u4e21\u65b9\u306e\u884c<\/em> \u3092\u6709\u3059\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002\u4ee5\u4e0b\u3067\u306f\u3001\u6df1\u523b\u306a\u30d0\u30b0\u304c\u304a\u5ba2\u69d8\u304b\u3089\u95a2\u7a0e\u624b\u6570\u6599\u3092 2 \u5ea6\u30c1\u30e3\u30fc\u30b8\u3057\u3066\u3057\u307e\u3044\u307e\u3059:<\/p>\n<p><a href=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_124207_pm.png\"><img loading=\"lazy\" decoding=\"async\" class=\"aligncenter size-full wp-image-2841\" src=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_124207_pm.png\" alt=\"rsz_screen_shot_2015-02-16_at_124207_pm\" width=\"600\" height=\"130\" srcset=\"https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_124207_pm.png 600w, https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_124207_pm-300x65.png 300w\" sizes=\"auto, (max-width: 600px) 100vw, 600px\" \/><\/a><\/p>\n<p>(\u3053\u308c\u306f\u660e\u3089\u304b\u306b\u5927\u3052\u3055\u306a\u4f8b\u3067\u3059\u304c\u3001\u30b3\u30fc\u30c9\u3084\u8ad6\u7406\u306e\u8907\u88fd\u306f\u3001\u304b\u306a\u308a\u6df1\u523b\u306a\u554f\u984c\u3092\u3082\u305f\u3089\u3057\u5f97\u308b\u306e\u3067\u3059: <tt><a href=\"https:\/\/www.imperialviolet.org\/2014\/02\/22\/applebug.html\" target=\"_blank\">goto fail;<\/a><\/tt> \u306e\u8a71\u3001\u805e\u3044\u305f\u4e8b\u306f\u3042\u308a\u307e\u305b\u3093\u304b\uff1f)<\/p>\n<p>\u6700\u521d\u306b\u30a2\u30ea\u30b9\u306e\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092 <tt>master<\/tt> \u306b\u30de\u30fc\u30b8\u3057\u305f\u3082\u306e\u3068\u4eee\u5b9a\u3057\u3066\u3001\u30d6\u30e9\u30f3\u30c1\u306e\u5148\u7aef\u304b\u3089\u5171\u901a\u306e\u5148\u7956\u3078\u3068\u300c\u30c8\u30ea\u30d7\u30eb\u30c9\u30c3\u30c8\u300d<tt>git diff<\/tt> \u3092\u4f7f\u7528\u3057\u305f\u5834\u5408\u3001\u30dc\u30d6\u306e\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306f\u6b21\u306e\u3088\u3046\u306b\u8868\u793a\u3055\u308c\u307e\u3059:<\/p>\n<p><a href=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_124323_pm.png\"><img loading=\"lazy\" decoding=\"async\" class=\"aligncenter size-full wp-image-2842\" src=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_124323_pm.png\" alt=\"rsz_screen_shot_2015-02-16_at_124323_pm\" width=\"600\" height=\"115\" srcset=\"https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_124323_pm.png 600w, https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_124323_pm-300x58.png 300w\" sizes=\"auto, (max-width: 600px) 100vw, 600px\" \/><\/a><\/p>\n<p>\u5148\u7956\u306b\u5bfe\u3059\u308b diff \u3092\u30ec\u30d3\u30e5\u30fc\u3057\u3066\u3044\u308b\u305f\u3081\u3001\u30de\u30fc\u30b8\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u305f\u6642\u306b\u751f\u3058\u308b\u3001\u5dee\u3057\u8feb\u3063\u305f\u60aa\u5922\u306b\u95a2\u3057\u3066\u4e00\u5207\u306e\u8b66\u544a\u304c\u3042\u308a\u307e\u305b\u3093\u3002<\/p>\n<p>\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3067\u672c\u5f53\u306b\u898b\u305f\u3044\u306e\u306f\u3001\u30dc\u30d6\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u30de\u30fc\u30b8\u3057\u305f\u969b\u306b <tt>master<\/tt> \u304c\u3069\u306e\u3088\u3046\u306b\u5909\u66f4\u3059\u308b\u306e\u304b\u3068\u3044\u3046\u70b9\u3067\u3059:<\/p>\n<p><a href=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_124438_pm.png\"><img loading=\"lazy\" decoding=\"async\" class=\"aligncenter size-full wp-image-2843\" src=\"http:\/\/aatljapan.wpengine.com\/files\/rsz_screen_shot_2015-02-16_at_124438_pm.png\" alt=\"rsz_screen_shot_2015-02-16_at_124438_pm\" width=\"600\" height=\"131\" srcset=\"https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_124438_pm.png 600w, https:\/\/aatljapan.wpengine.com\/wp-content\/uploads\/rsz_screen_shot_2015-02-16_at_124438_pm-300x66.png 300w\" sizes=\"auto, (max-width: 600px) 100vw, 600px\" \/><\/a><\/p>\n<p>\u3053\u306e diff \u3067\u306f\u3001\u554f\u984c\u304c\u660e\u78ba\u306b\u8868\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u30ec\u30d3\u30e5\u30ef\u30fc\u306f\u8907\u88fd\u3055\u308c\u305f\u884c\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d (\u305d\u3046\u3067\u306a\u3044\u3068\u56f0\u308a\u307e\u3059\u306d)\u3001\u30b3\u30fc\u30c9\u306b\u306f\u307e\u3060\u4f5c\u696d\u304c\u5fc5\u8981\u3067\u3042\u308b\u3053\u3068\u3092\u30dc\u30d6\u306b\u4f1d\u3048\u3001\u6df1\u523b\u306a\u30d0\u30b0\u304c <tt>master<\/tt>\u3001\u3072\u3044\u3066\u306f\u672c\u756a\u74b0\u5883\u306b\u5230\u9054\u3057\u3066\u3057\u307e\u3046\u4e8b\u614b\u3092\u9632\u3052\u308b\u306e\u3067\u3059\u3002<\/p>\n<p>Bitbucket \u3068 Stash \u306b\u304a\u3044\u3066\u3001\u79c1\u305f\u3061\u306f\u3053\u306e\u3088\u3046\u306a\u65b9\u6cd5\u3067\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e diff \u3092\u5b9f\u88c5\u3059\u308b\u3053\u3068\u306b\u6c7a\u3081\u307e\u3057\u305f\u3002\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u898b\u308b\u6642\u306f\u3001\u305d\u306e\u7d50\u679c\u3068\u3057\u3066\u8d77\u3053\u308b\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u3069\u306e\u3088\u3046\u306b\u8868\u308c\u308b\u304b\u3092\u60f3\u5b9a\u3057\u3066\u3044\u308b\u306e\u3067\u3059\u3002\u3053\u308c\u3092\u3001\u79c1\u305f\u3061\u306f\u821e\u53f0\u88cf\u3067\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u3001\u305d\u308c\u3068\u30bf\u30fc\u30b2\u30c3\u30c8\u30d6\u30e9\u30f3\u30c1\u306e\u5148\u7aef\u306e\u5dee\u5206\u3092\u793a\u3059\u3053\u3068\u3067\u884c\u3063\u3066\u3044\u308b\u306e\u3067\u3059:<\/p>\n<figure id=\"attachment_2846\" aria-describedby=\"caption-attachment-2846\" style=\"width: 600px\" class=\"wp-caption aligncenter\"><a href=\"http:\/\/aatljapan.wpengine.com\/files\/merge-result-e1424149180701.png\"><img loading=\"lazy\" decoding=\"async\" class=\"wp-image-2846 size-full\" src=\"http:\/\/aatljapan.wpengine.com\/files\/merge-result-e1424149180701.png\" alt=\"D \u304c \u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8 \u3067\u3042\u308b\u6642\u3001git diff C D \u306f 2 \u3064\u306e\u30d6\u30e9\u30f3\u30c1\u306e \u5168\u3066\u306e \u5dee\u5206\u3092\u793a\u3059\" width=\"600\" height=\"189\" \/><\/a><figcaption id=\"caption-attachment-2846\" class=\"wp-caption-text\"><span class=\"mono\">D<\/span> \u304c<strong>\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8<\/strong> \u3067\u3042\u308b\u6642\u3001<span class=\"mono\">git diff C D<\/span> \u306f 2 \u3064\u306e\u30d6\u30e9\u30f3\u30c1\u306e <em>\u5168\u3066\u306e<\/em> \u5dee\u5206\u3092\u793a\u3059<\/figcaption><\/figure>\n<p>\u540c\u3058\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u4ed6\u306e\u3044\u304f\u3064\u304b\u306e\u30db\u30b9\u30c6\u30a3\u30f3\u30b0\u30d7\u30ed\u30d0\u30a4\u30c0\u306b\u30d7\u30c3\u30b7\u30e5\u3057\u3066\u3042\u308b\u306e\u3067\u3001\u8208\u5473\u304c\u3042\u308b\u4eba\u306f\u52d5\u4f5c\u4e2d\u306e\u7570\u306a\u308b diff \u30a2\u30eb\u30b4\u30ea\u30ba\u30e0\u3092\u78ba\u8a8d\u3067\u304d\u307e\u3059:<\/p>\n<ul>\n<li><a href=\"https:\/\/github.com\/kannonboy\/abpr\/pull\/2\/files\">GitHub \u306e\u300c\u30c8\u30ea\u30d7\u30eb\u30c9\u30c3\u30c8\u300d diff<\/a> \u306b\u3088\u308b\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8<\/li>\n<li><a href=\"https:\/\/bitbucket.org\/tpettersen\/abpr\/pull-request\/2\/fixed-a-bug-that-would-charge-2x\/diff\">Bitbucket \u306e\u300c\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u300d diff<\/a> \u306b\u3088\u308b\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8<\/li>\n<li><a href=\"https:\/\/gitlab.com\/kannonboy\/abpr\/merge_requests\/2\/diffs\">GitLab \u306e\u300c\u30c8\u30ea\u30d7\u30eb\u30c9\u30c3\u30c8\u300ddiff<\/a> \u306b\u3088\u308b\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8<\/li>\n<\/ul>\n<p>Bitbucket \u3068 Stash \u3067\u4f7f\u308f\u308c\u3066\u3044\u308b\u300c\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u300ddiff \u306f\u3001\u30de\u30fc\u30b8\u3057\u305f\u969b\u306b\u9069\u7528\u3055\u308c\u308b <em>\u5b9f\u969b\u306e\u5909\u66f4\u5185\u5bb9<\/em> \u3092\u793a\u3057\u3066\u3044\u307e\u3059\u3002\u3053\u308c\u306b\u306f\u88cf\u304c\u3042\u3063\u3066\u3001\u5b9f\u88c5\u304c\u3088\u308a\u96e3\u3057\u304f\u3001\u307e\u305f\u5b9f\u884c\u306b\u3082\u3088\u308a\u591a\u304f\u306e\u30b3\u30b9\u30c8\u304c\u304b\u304b\u308b\u3068\u3044\u3046\u3053\u3068\u3067\u3059\u3002<\/p>\n<h2 id=\"moving-targets\">\u79fb\u52d5\u3059\u308b\u30bf\u30fc\u30b2\u30c3\u30c8<\/h2>\n<p>\uff11\u3064\u76ee\u306e\u554f\u984c\u306f\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8 <tt>D<\/tt> \u304c\u307e\u3060\u5b9f\u969b\u306b\u306f\u5b58\u5728\u3057\u306a\u3044\u3068\u3044\u3046\u70b9\u3067\u3059\u3002\u305d\u306e\u4e0a\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306e\u4f5c\u6210\u306f\u7d50\u69cb\u30b3\u30b9\u30c8\u306e\u304b\u304b\u308b\u884c\u7a0b\u306a\u306e\u3067\u3059\u3002\uff12\u3064\u76ee\u306e\u554f\u984c\u306f\u3001\u5358\u306b <tt>D<\/tt> \u3092\u4f5c\u6210\u3057\u3066\u30cf\u30a4\u7d42\u4e86\u3001\u3068\u306f\u3044\u304b\u306a\u3044\u70b9\u306b\u3042\u308a\u307e\u3059\u3002\u79c1\u305f\u3061\u306e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306e\u89aa\u3067\u3042\u308b <tt>B<\/tt> \u3068 <tt>C<\/tt> \u306f\u3001\u3044\u3064\u5909\u308f\u3063\u3066\u3082\u304a\u304b\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u3053\u308c\u3089\u89aa\u3078\u306e\u5909\u66f4\u3092\u3001\u79c1\u305f\u3061\u306f\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306e <em>\u30ea\u30b9\u30b3\u30fc\u30d4\u30f3\u30b0 (rescoping)<\/em> \u3068\u547c\u3093\u3067\u3044\u307e\u3059\u304c\u3001\u305d\u308c\u306f\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u304c\u30de\u30fc\u30b8\u3055\u308c\u305f\u969b\u306b\u9069\u7528\u3055\u308c\u308b diff \u3092\u52b9\u679c\u7684\u306b\u5909\u66f4\u3067\u304d\u308b\u304b\u3089\u3067\u3059\u3002\u3042\u306a\u305f\u306e\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u304c <tt>master<\/tt> \u306e\u3088\u3046\u306a\u5909\u66f4\u306e\u591a\u3044\u30d6\u30e9\u30f3\u30c1\u3092\u30bf\u30fc\u30b2\u30c3\u30c8\u306b\u3057\u3066\u3044\u308b\u5834\u5408\u3001\u305d\u308c\u306f\u975e\u5e38\u306b\u983b\u7e41\u306b\u30ea\u30b9\u30b3\u30fc\u30d4\u30f3\u30b0\u3055\u308c\u3066\u3044\u308b\u3068\u8003\u3048\u3066\u3088\u3044\u3067\u3057\u3087\u3046\u3002<\/p>\n<figure id=\"attachment_2847\" aria-describedby=\"caption-attachment-2847\" style=\"width: 600px\" class=\"wp-caption aligncenter\"><a href=\"http:\/\/aatljapan.wpengine.com\/files\/rescopes-e1424149242956.png\"><img loading=\"lazy\" decoding=\"async\" class=\"size-full wp-image-2847\" src=\"http:\/\/aatljapan.wpengine.com\/files\/rescopes-e1424149242956.png\" alt=\"\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306f\u3001\u3044\u305a\u308c\u304b\u306e \u30d6\u30e9\u30f3\u30c1\u304c\u5909\u66f4\u3055\u308c\u305f\u969b\u3001\u3044\u3064\u3067\u3082\u4f5c\u6210\u3055\u308c\u307e\u3059\u3002\" width=\"600\" height=\"172\" \/><\/a><figcaption id=\"caption-attachment-2847\" class=\"wp-caption-text\">\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306f\u3001<em>\u3044\u305a\u308c\u304b\u306e<\/em> \u30d6\u30e9\u30f3\u30c1\u304c\u5909\u66f4\u3055\u308c\u305f\u969b\u3001\u3044\u3064\u3067\u3082\u4f5c\u6210\u3055\u308c\u307e\u3059\u3002<\/figcaption><\/figure>\n<p>\u5b9f\u969b\u3001\u8ab0\u304b\u304c <tt>master<\/tt> <em>\u3082\u3057\u304f\u306f<\/em> \u3042\u306a\u305f\u306e\u30d5\u30a3\u30fc\u30c1\u30e3\u30fc\u30d6\u30e9\u30f3\u30c1\u3078\u3068\u30d6\u30e9\u30f3\u30c1\u306e\u30d7\u30c3\u30b7\u30e5\u3084\u30de\u30fc\u30b8\u3092\u884c\u3046\u5ea6\u306b\u3001Bitbucket \u304b Stash \u306f\u6b63\u78ba\u306a diff \u3092\u793a\u305d\u3046\u3068\u3057\u3066\u3001\u65b0\u305f\u306a\u30de\u30fc\u30b8\u3092\u8a08\u7b97\u3057\u306a\u304f\u3066\u306f\u306a\u3089\u306a\u3044\u53ef\u80fd\u6027\u304c\u9ad8\u3044\u306e\u3067\u3059\u3002<\/p>\n<h2 id=\"handling-merge-conflicts\">\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u53d6\u6271\u3044<\/h2>\n<p>\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8 diff \u3092\u751f\u6210\u3059\u308b\u305f\u3081\u306b\u30de\u30fc\u30b8\u3059\u308b\u3053\u3068\u306e\u3082\u3046\uff11\u3064\u306e\u554f\u984c\u306f\u3001\u4f55\u304b\u3068\u30de\u30fc\u30b8\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u51e6\u7406\u3059\u308b\u5fc5\u8981\u304c\u51fa\u3066\u304f\u308b\u3068\u3044\u3046\u3053\u3068\u3067\u3059\u3002\u3042\u306a\u305f\u306e git \u30b5\u30fc\u30d0\u30fc\u306f\u975e\u5bfe\u8a71\u578b\u3067\u5b9f\u884c\u4e2d\u306e\u305f\u3081\u3001\u3053\u308c\u3092\u89e3\u6c7a\u3067\u304d\u308b\u4eba\u304c\u8ab0\u3082\u3044\u307e\u305b\u3093\u3002\u3053\u3046\u306a\u308b\u3068\u8a71\u306f\u3084\u3084\u3053\u3057\u304f\u306a\u308a\u305d\u3046\u306a\u3082\u306e\u3067\u3059\u304c\u3001\u3053\u308c\u304c\u5b9f\u969b\u306b\u306f\u5229\u70b9\u306b\u306a\u308b\u306e\u3067\u3059\u3002\u79c1\u305f\u3061\u306f Bitbucket \u3068 Stash \u306b\u304a\u3044\u3066\u3001\u5b9f\u969b\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u30de\u30fc\u30ab\u30fc\u3092\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8 <tt>D<\/tt> \u306e\u4e00\u90e8\u3068\u3057\u3066<em>\u30b3\u30df\u30c3\u30c8<\/em>\u3057\u305f\u5f8c\u3001diff \u3067\u8a18\u3057\u3066\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u304c\u3069\u306e\u3088\u3046\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u308b\u304b\u3092\u793a\u3057\u307e\u3059:<\/p>\n<figure id=\"attachment_2848\" aria-describedby=\"caption-attachment-2848\" style=\"width: 600px\" class=\"wp-caption aligncenter\"><a href=\"http:\/\/aatljapan.wpengine.com\/files\/conflicts-bitbucket-e1424149293153.png\"><img loading=\"lazy\" decoding=\"async\" class=\"size-full wp-image-2848\" src=\"http:\/\/aatljapan.wpengine.com\/files\/conflicts-bitbucket-e1424149293153.png\" alt=\"Bitbucket \u3068 Stash diff \u3067\u306f: \u7dd1 \u306e\u884c\u304c\u8ffd\u52a0\u3001 \u8d64 \u306e\u884c\u304c\u524a\u9664\u3001\u305d\u3057\u3066 \u30aa\u30ec\u30f3\u30b8 \u306e\u884c\u304c\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u610f\u5473\u3057\u307e\u3059\u3002\" width=\"600\" height=\"296\" \/><\/a><figcaption id=\"caption-attachment-2848\" class=\"wp-caption-text\">Bitbucket \u3068 Stash diff \u3067\u306f: <span style=\"color: green;\">\u7dd1<\/span> \u306e\u884c\u304c\u8ffd\u52a0\u3001<span style=\"color: red;\">\u8d64<\/span> \u306e\u884c\u304c\u524a\u9664\u3001\u305d\u3057\u3066 <span style=\"color: orange;\">\u30aa\u30ec\u30f3\u30b8<\/span> \u306e\u884c\u304c\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u610f\u5473\u3057\u307e\u3059\u3002<\/figcaption><\/figure>\n<p>\u3053\u308c\u306f\u3001\u3042\u306a\u305f\u306e\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u304c\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u4e8b\u524d\u306b\u691c\u77e5\u3067\u304d\u308b\u3060\u3051\u3067\u306a\u304f\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6c7a\u65b9\u6cd5\u306b\u3064\u3044\u3066\u30ec\u30d3\u30e5\u30ef\u30fc\u304c\u8a71\u3057\u5408\u3048\u308b\u3053\u3068\u3082\u610f\u5473\u3057\u307e\u3059\u3002\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u306f\u5e38\u306b\u5c11\u306a\u304f\u3068\u3082 2 \u5f53\u4e8b\u8005\u304c\u95a2\u308f\u3063\u3066\u3044\u308b\u305f\u3081\u3001\u79c1\u305f\u3061\u306f\u9069\u5207\u306a\u89e3\u6c7a\u7b56\u306e\u5224\u65ad\u306b\u306f\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u304c\u6700\u9069\u3060\u3068\u8003\u3048\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>\u8907\u96d1\u6027\u3068\u30b3\u30b9\u30c8\u304c\u5897\u3059\u3082\u306e\u306e\u3001Stash \u3068 Bitbucket \u3067\u3068\u3063\u305f\u65b9\u6cd5\u306f\u6700\u3082\u6b63\u78ba\u304b\u3064\u4fbf\u5229\u306a\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8 diff \u3060\u3068\u601d\u3044\u307e\u3059\u3002\u8cea\u554f\u3042\u308b\u3044\u306f\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u306e\u3042\u308b\u65b9\u306f\u3001\u30b3\u30e1\u30f3\u30c8\u3082\u3057\u304f\u306f Twitter \u3067\u304a\u77e5\u3089\u305b\u304f\u3060\u3055\u3044\u3002\u3088\u308d\u3057\u3051\u308c\u3070 (<a href=\"https:\/\/twitter.com\/kannonboy\">@kannonboy<\/a>) \u3067\u79c1\u3092\u30d5\u30a9\u30ed\u30fc\u3057\u3066\u3001Git \u3084 Bitbucket \u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3001\u305d\u3057\u3066\u305d\u306e\u4ed6\u306e\u7d20\u6674\u3089\u3057\u3044\u8a71\u3092\u30b2\u30c3\u30c8\u3057\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n<p><small><br \/>\n*\u672c\u30d6\u30ed\u30b0\u306f Atlassian Developers \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 : 2015 \u5e74 1 \u6708 22 \u65e5\u6295\u7a3f \"<a href=\"https:\/\/developer.atlassian.com\/blog\/2015\/01\/a-better-pull-request\/\" target=\"_blank\">A better pull request<\/a>\"<br \/>\n<\/small><\/p>\n","protected":false},"excerpt":{"rendered":"<p>Git \u3092\u4f7f\u3063\u3066\u3044\u308b\u306a\u3089\u3070\u3001\u6050\u3089\u304f \u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8 \u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u3053\u3068\u3067\u3057\u3087\u3046\u3002\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u306f\u3001DVCS \u306e\u9ece\u660e\u671f\u304b\u3089\u3001\u4f55\u304b\u3057\u3089\u306e\u5f62\u3067\u5b58\u5728\u3057\u3066\u304d\u307e\u3057\u305f\u3002Bitbucket \u3068 G&hellip;<\/p>\n","protected":false},"author":47,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"bitbucket_subtitle":"","footnotes":""},"categories":[1],"tags":[173],"coauthors":[],"class_list":["post-2832","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-173"],"acf":[],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/2832","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\/47"}],"replies":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/comments?post=2832"}],"version-history":[{"count":0,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/2832\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/media?parent=2832"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/categories?post=2832"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/tags?post=2832"},{"taxonomy":"author","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/coauthors?post=2832"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}