{"id":296,"date":"2021-12-10T10:48:35","date_gmt":"2021-12-10T15:48:35","guid":{"rendered":"https:\/\/ericburdo.com\/blog\/?p=296"},"modified":"2021-12-10T10:48:35","modified_gmt":"2021-12-10T15:48:35","slug":"using-winmerge-with-sourcetree","status":"publish","type":"post","link":"http:\/\/ericburdo.com\/blog\/tech-tips\/296\/using-winmerge-with-sourcetree\/","title":{"rendered":"Using WinMerge with Sourcetree"},"content":{"rendered":"\n<p>For work, I often use Sourcetree as my UI for dealing with BitBucket.<\/p>\n\n\n\n<p>I&#8217;ve been using WinMerge for more years than I can count.<br \/><br \/>You can setup WinMerge as the Diff tool really easily in Sourcetree.  Just pick it in the settings.  :)<br \/><br \/>But, if you want to use WinMerge as your Merge tool, you need to set Custom settings.<\/p>\n\n\n\n<p><\/p>\n\n\n\n<p><\/p>\n\n\n\n<p><\/p>\n\n\n\n<p><strong>External Diff Tool: WinMerge<\/strong><br \/>Diff Command: C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe<br \/>Arguments: \\&#8221;$LOCAL\\&#8221; \\&#8221;$REMOTE\\&#8221;<\/p>\n\n\n\n<p><strong>Merge Tool: Custom<\/strong><br \/>Merge Command: C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe<br \/>Arguments: -wl -wm -dl PreviousVersion -dm Base -dr Local $LOCAL $BASE $REMOTE -o $MERGED<\/p>\n","protected":false},"excerpt":{"rendered":"<p>For work, I often use Sourcetree as my UI for dealing with BitBucket. I&#8217;ve been using WinMerge for more years than I can count. You can setup WinMerge as the Diff tool really easily in Sourcetree. Just pick it in the settings. :) But, if you want to use WinMerge as your Merge tool, you [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[93],"tags":[],"class_list":["post-296","post","type-post","status-publish","format-standard","hentry","category-tech-tips"],"_links":{"self":[{"href":"http:\/\/ericburdo.com\/blog\/wp-json\/wp\/v2\/posts\/296","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/ericburdo.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/ericburdo.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/ericburdo.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/ericburdo.com\/blog\/wp-json\/wp\/v2\/comments?post=296"}],"version-history":[{"count":1,"href":"http:\/\/ericburdo.com\/blog\/wp-json\/wp\/v2\/posts\/296\/revisions"}],"predecessor-version":[{"id":297,"href":"http:\/\/ericburdo.com\/blog\/wp-json\/wp\/v2\/posts\/296\/revisions\/297"}],"wp:attachment":[{"href":"http:\/\/ericburdo.com\/blog\/wp-json\/wp\/v2\/media?parent=296"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/ericburdo.com\/blog\/wp-json\/wp\/v2\/categories?post=296"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/ericburdo.com\/blog\/wp-json\/wp\/v2\/tags?post=296"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}