SourceTree File Comparison Overview

SourceTree File Comparison Overview

Setting KDiff file comparison tool for SourceTree File comparison using KDiff3 tool for SourceTree File comparison using custom tools

Gitflow Hotfix Overview

Gitflow Hotfix Overview

Git flow starting a new Hotfix Git flow adding commits to a new Hotfix Git Flow finishing a hotfix

Gitflow Release Overview

Gitflow Release Overview

Git flow starting a new Release Git flow adding commits to a new Release Git Flow finishing a release

Gitflow Feature Overview

Gitflow Feature Overview

Git flow starting a new Feature Git flow adding commits to a new Feature Git Flow finishing a feature

Gitflow Overview

Gitflow Overview

What is Git Flow Git-flow working branches Creating a Git-Flow branching structure using Source Tree

SourceTree Branching and Merging Overview

SourceTree Branching and Merging Overview

Branch Vs Checkout in Git Checkout in SourceTree (switch branches) Creating a new Branch in SourceTree Checkout (Create new Branch) Merging Branches Rebase in SourceTree Fetch in SourceTree Pull in SourceTree

SourceTree Overview

SourceTree Overview

What is SourceTree? SourceTree Creating a Clone Repository (Working Copy) from the remote Repository. SourceTree checking File Difference between Local and Staged SourceTree - Adding new Files to Index SourceTree staging modified files Committing Changes to the local repository Pushing local repository changes to remote repository View change history of a file in SourceTree View changes line by line using SourceTree Stashing changes to a file in SourceTree Discarding changes to a file in SourceTree Deleting a local Repository using SourceTree

File comparison using custom tools

Source Tree by default uses its own File Comparison mechanism to compare difference between files and directories. Source Tree also provides built-in support to some of the tools like FileMerge, DiffMerge, Araxis Merge, KDiff3, we can install these tools and select one of these tools for file comparison.

Apart from the above tools, SourceTree can also be configured to use other custom tools, to use other tools we need to select the custom option and provide the command and arguments for comparison.

File comparison using KDiff3 tool for SourceTree

In the post Setting KDiff file comparison tool for SourceTree we saw on how to set up the KDiff3 tool as a file comparison tool for Source Tree, here we shall see on how to compare 2 files using KDiff3.

1. Open SourceTree.
2. Select the file to be compared.
3. Right click the file and select “Log Selected” option from the context menu

4. Select the 2 versions (commits) to be compared, this will show the difference between the 2 files in the default compare tool.

5. Click on the External Diff button on the top right corner.
6. This will open up the KDiff3 tool automatically and show the difference between the 2 versions (commits) in KDiff3
7. Similarly we can set up source tree to use other file comparison/Merge tools like Beyond-Compare, WinMerge etc..
8. KDiff is an independent tool, it can also be used to do comparison between 2 files in the disk.

Setting KDiff file comparison tool for SourceTree

Source Tree by default uses its own File Comparison mechanism to compare difference between files and directories. Source Tree also provides built-in support to some of the tools like FileMerge, DiffMerge, Araxis Merge, KDiff3, we can install these tools and select one of these tools for file comparison.

To use KDiff, we should first download and install the KDiff3 tool from source forge http://kdiff3.sourceforge.net/