{"id":1367,"date":"2020-12-11T17:32:02","date_gmt":"2020-12-11T06:32:02","guid":{"rendered":"https:\/\/www.hogepiyo.com\/wp\/?p=1367"},"modified":"2020-12-11T17:32:05","modified_gmt":"2020-12-11T06:32:05","slug":"sourcetree-%e3%81%a7-diff-%e3%83%84%e3%83%bc%e3%83%ab%e3%81%8c%e8%b5%b7%e5%8b%95%e3%81%97%e3%81%aa%e3%81%8f%e3%81%aa%e3%82%8b%e5%95%8f%e9%a1%8c","status":"publish","type":"post","link":"https:\/\/www.hogepiyo.com\/wp\/?p=1367","title":{"rendered":"Sourcetree \u3067 diff \u30c4\u30fc\u30eb\u304c\u8d77\u52d5\u3057\u306a\u304f\u306a\u308b\u554f\u984c"},"content":{"rendered":"\n\n\n<p>mac \u7248\u306e Sourcetree \u306e\u5916\u90e8 diff \u30c4\u30fc\u30eb\u304c\u3044\u3064\u306e\u9593\u306b\u304b\u958b\u304b\u306a\u304f\u306a\u3063\u3066\u3044\u307e\u3057\u305f\u3002<\/p>\n\n\n\n<p>Xcode \u306b\u4ed8\u5c5e\u3057\u3066\u3044\u308b FileMerge \u3092\u5916\u90e8\u30c4\u30fc\u30eb\u3068\u3057\u3066\u4f7f\u3048\u308b\u3088\u3046\u306b\u8a2d\u5b9a\u3057\u306a\u304a\u3057\u307e\u3059\u3002<\/p>\n\n\n\n<div id=\"ez-toc-container\" class=\"ez-toc-v2_0_82_2 counter-hierarchy ez-toc-counter ez-toc-grey ez-toc-container-direction\">\n<p class=\"ez-toc-title\" style=\"cursor:inherit\">\u30b3\u30f3\u30c6\u30f3\u30c4<\/p>\n<label for=\"ez-toc-cssicon-toggle-item-69f2a1e97172b\" class=\"ez-toc-cssicon-toggle-label\"><span class=\"\"><span class=\"eztoc-hide\" style=\"display:none;\">Toggle<\/span><span class=\"ez-toc-icon-toggle-span\"><svg style=\"fill: #999;color:#999\" xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"list-377408\" width=\"20px\" height=\"20px\" viewBox=\"0 0 24 24\" fill=\"none\"><path d=\"M6 6H4v2h2V6zm14 0H8v2h12V6zM4 11h2v2H4v-2zm16 0H8v2h12v-2zM4 16h2v2H4v-2zm16 0H8v2h12v-2z\" fill=\"currentColor\"><\/path><\/svg><svg style=\"fill: #999;color:#999\" class=\"arrow-unsorted-368013\" xmlns=\"http:\/\/www.w3.org\/2000\/svg\" width=\"10px\" height=\"10px\" viewBox=\"0 0 24 24\" version=\"1.2\" baseProfile=\"tiny\"><path d=\"M18.2 9.3l-6.2-6.3-6.2 6.3c-.2.2-.3.4-.3.7s.1.5.3.7c.2.2.4.3.7.3h11c.3 0 .5-.1.7-.3.2-.2.3-.5.3-.7s-.1-.5-.3-.7zM5.8 14.7l6.2 6.3 6.2-6.3c.2-.2.3-.5.3-.7s-.1-.5-.3-.7c-.2-.2-.4-.3-.7-.3h-11c-.3 0-.5.1-.7.3-.2.2-.3.5-.3.7s.1.5.3.7z\"\/><\/svg><\/span><\/span><\/label><input type=\"checkbox\"  id=\"ez-toc-cssicon-toggle-item-69f2a1e97172b\"  aria-label=\"Toggle\" \/><nav><ul class='ez-toc-list ez-toc-list-level-1 ' ><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-1\" href=\"https:\/\/www.hogepiyo.com\/wp\/?p=1367\/#%E5%AE%9F%E8%A1%8C%E7%92%B0%E5%A2%83\" >\u5b9f\u884c\u74b0\u5883<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-2\" href=\"https:\/\/www.hogepiyo.com\/wp\/?p=1367\/#%E7%97%87%E7%8A%B6\" >\u75c7\u72b6<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-3\" href=\"https:\/\/www.hogepiyo.com\/wp\/?p=1367\/#%E5%AF%BE%E7%AD%96\" >\u5bfe\u7b56<\/a><\/li><\/ul><\/nav><\/div>\n<h2 class=\"wp-block-heading\"><span class=\"ez-toc-section\" id=\"%E5%AE%9F%E8%A1%8C%E7%92%B0%E5%A2%83\"><\/span>\u5b9f\u884c\u74b0\u5883<span class=\"ez-toc-section-end\"><\/span><\/h2>\n\n\n\n<dl class=\"definition-table\">\n<dt>OS<\/dt>\n<dd>macOS Catalina Version 10.15.7<\/dd>\n<dt>Sourcetree<\/dt>\n<dd>Version 4.0.2 (236)<\/dd>\n<\/dl>\n\n\n\n<h2 class=\"wp-block-heading\"><span class=\"ez-toc-section\" id=\"%E7%97%87%E7%8A%B6\"><\/span>\u75c7\u72b6<span class=\"ez-toc-section-end\"><\/span><\/h2>\n\n\n\n<p>\u30d5\u30a1\u30a4\u30eb\u3092\u53f3\u30af\u30ea\u30c3\u30af\u3057\u3066 &#8220;External Diff&#8221; \u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u3082 FileMerge \u304c\u958b\u304d\u307e\u305b\u3093\u3002<\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><a href=\"https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-01.png\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"469\" src=\"https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-01-1024x469.png\" alt=\"\" class=\"wp-image-1368\" srcset=\"https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-01-1024x469.png 1024w, https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-01-300x137.png 300w, https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-01-768x352.png 768w, https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-01-1536x703.png 1536w, https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-01.png 1634w\" sizes=\"auto, (max-width: 767px) 89vw, (max-width: 1000px) 54vw, (max-width: 1071px) 543px, 580px\" \/><\/a><\/figure>\n\n\n\n<h2 class=\"wp-block-heading\"><span class=\"ez-toc-section\" id=\"%E5%AF%BE%E7%AD%96\"><\/span>\u5bfe\u7b56<span class=\"ez-toc-section-end\"><\/span><\/h2>\n\n\n\n<p>Sourcetree \u306e Preferences \u3092\u958b\u3044\u3066\u3001Diff \u30bf\u30d6\u3092\u958b\u304d\u307e\u3059\u3002<\/p>\n\n\n\n<p>Visual Diff Tool \u3067 Custom&#8230; \u3092\u9078\u3073\u3001Diff Command \u3068 Arguments \u306b\u4ee5\u4e0b\u3092\u5165\u529b\u3059\u308b\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>\/Applications\/Xcode.app\/Contents\/Applications\/FileMerge.app\/Contents\/MacOS\/FileMerge<\/code><\/pre>\n\n\n\n<pre class=\"wp-block-code\"><code>-left $LOCAL -right $REMOTE<\/code><\/pre>\n\n\n\n<figure class=\"wp-block-image size-large\"><a href=\"https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-02.png\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"768\" src=\"https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-02-1024x768.png\" alt=\"\" class=\"wp-image-1369\" srcset=\"https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-02-1024x768.png 1024w, https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-02-300x225.png 300w, https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-02-768x576.png 768w, https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-02-1536x1152.png 1536w, https:\/\/www.hogepiyo.com\/wp\/wp-content\/uploads\/2020\/12\/Sourcetree-diff-tool-issue-02.png 1578w\" sizes=\"auto, (max-width: 767px) 89vw, (max-width: 1000px) 54vw, (max-width: 1071px) 543px, 580px\" \/><\/a><\/figure>\n","protected":false},"excerpt":{"rendered":"<p>mac \u7248\u306e Sourcetree \u306e\u5916\u90e8 diff \u30c4\u30fc\u30eb\u304c\u3044\u3064\u306e\u9593\u306b\u304b\u958b\u304b\u306a\u304f\u306a\u3063\u3066\u3044\u307e\u3057\u305f\u3002 Xcode \u306b\u4ed8\u5c5e\u3057\u3066\u3044\u308b FileMerge \u3092\u5916\u90e8\u30c4\u30fc\u30eb\u3068\u3057\u3066\u4f7f\u3048\u308b\u3088\u3046\u306b\u8a2d\u5b9a\u3057\u306a\u304a\u3057\u307e\u3059\u3002 \u5b9f\u884c\u74b0\u5883 OS mac &hellip; <\/p>\n<p class=\"link-more\"><a href=\"https:\/\/www.hogepiyo.com\/wp\/?p=1367\" class=\"more-link\"><span class=\"screen-reader-text\">&#8220;Sourcetree \u3067 diff \u30c4\u30fc\u30eb\u304c\u8d77\u52d5\u3057\u306a\u304f\u306a\u308b\u554f\u984c&#8221; \u306e<\/span>\u7d9a\u304d\u3092\u8aad\u3080<\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[51],"tags":[211],"class_list":["post-1367","post","type-post","status-publish","format-standard","hentry","category-mac-software","tag-sourcetree"],"aioseo_notices":[],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/www.hogepiyo.com\/wp\/index.php?rest_route=\/wp\/v2\/posts\/1367","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.hogepiyo.com\/wp\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.hogepiyo.com\/wp\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.hogepiyo.com\/wp\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.hogepiyo.com\/wp\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=1367"}],"version-history":[{"count":1,"href":"https:\/\/www.hogepiyo.com\/wp\/index.php?rest_route=\/wp\/v2\/posts\/1367\/revisions"}],"predecessor-version":[{"id":1370,"href":"https:\/\/www.hogepiyo.com\/wp\/index.php?rest_route=\/wp\/v2\/posts\/1367\/revisions\/1370"}],"wp:attachment":[{"href":"https:\/\/www.hogepiyo.com\/wp\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1367"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.hogepiyo.com\/wp\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=1367"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.hogepiyo.com\/wp\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=1367"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}