Sourcetree External Diff Tool

To add your supply request file, do the following:

Sourcetree External Diff Tool Not Launching

Sourcetree External Diff Tool

Sourcetree External Diff Tool Visual Studio Code

  1. From your BitbucketStationSupplies in Bitbucket, click Source to open the source directory. Notice you only have one file, supplies.txt, in your directory.

    • A. Source page: Click the link to open this page.

    • B. Branch selection: Pick the branch you want to view.

    • C. More options button: Click to open a menu with more options, such as 'Add file'.

    • D. Source file area: View the directory of files in Bitbucket.

  2. From the Source page, click the More options button in the top right corner and select Add file from the menu. The More options button only appears after you have added at least one file to the repository. A page for creating the new file opens, as shown in the following image.

    • A. Branch with new file: Change if you want to add file to a different branch.

    • B. New file area: Add content for your new file here.

  3. Enter supplyrequest in the filename field.

  4. Select HTML from the Syntax mode list.

  5. Add the following HTML code to the text area:

    We are requesting additional supplies. Please send us the following:

    • space ice cream

    • nerf darts

    • telescope light shield

  6. Click Commit. The Commit message field appears with the message: supplyrequest created online with Bitbucket.

  7. Click Commit under the message field.

Git Diff Tools

In Mac, when you install Xcode you get a diff tool named FileMerge, simple but sufficient in most of the cases. You can try WinMerge for Windows, I've used it in the past and it's pretty nice, and open source. You can also try the P4 Merge tool from Perforce which is offered for free. Both options can be selected as a Diff/Merge Tool in SourceTree. In SourceTree, go to Tools Options Diff Set External Diff Tool and Merge Tool to Custom and set Diff Command in both to C: Program Files (x86) Microsoft Visual Studio 12.0 Common7 IDE vsDiffMerge.exe. Obviously use path to your VS installation. For External Diff Tool set Arguments to '$LOCAL' '$REMOTE' 'Source' 'Target' //t.