Sourcetree was a very very simple and easy to use application on mac. It is best replacement for GIT command line. When we need multiple branches, with merge conflicts it is best to use Sourcetree.
The file comparison tool can be integrated with SourceTree so that you can use it to compare changes. The advantages of doing this include:SRCTREEWIN-4713 SourceTree crashes in the middle of a visual merge (Merge using external tool) Closed SRCTREEWIN-4853 Crashes after closing external merge tool. SourceTree for Mac is the fast and easy way to work with Git and Mercurial. Easily utilise both distributed version control systems from one application. Work with your GitHub, Bitbucket, and Kiln accounts without leaving the application.
- The OxygenCompare Files tool presents the files side-by-side and makes it much easier to determine real changes.
- The OxygenCompare Files tool includes XML comparison algorithms.
- The OxygenCompare Files tool includes various options for configuring the comparison.
- The OxygenCompare Files tool allows you to navigate through changes.
To integrate the Compare Files tool with SourceTree, follow this procedure, depending on your operating system:
Download Sourcetree For Mac
- In SourceTree, go to Tools > Options.
- Go to the Diff tab.
- In the External Diff/Merge section, configure the settings as follows:
- External Diff Tool - Select Custom.
- Diff Command - Enter the path of the OxygendiffFile.exe file (for example: c:ProgramsOxygen XML Editor 19diffFiles.exe).
- Arguments - Enter -ext $REMOTE $LOCAL $LOCAL.
- Merge Tool - Select Custom.
- Diff Command - Enter the path of the OxygendiffFile.exe file (for example: c:ProgramsOxygen XML Editor 19diffFiles.exe).
- Arguments - Enter -ext $LOCAL $REMOTE $BASE $MERGED.
- Click OK.Result: In SourceTree, you can now compare file changes with the OxygenCompare Files tool by simply selecting External Diff from the contextual menu, Actions menu, or Ctrl+D.
Sourcetree External Merge Tool
- In SourceTree, go to SourceTree > Preferences.
- Go to the Diff tab.
- In the External Diff/Merge section, configure the settings as follows:
- External Diff Tool - Select Custom.
- Diff Command - Enter a command-line argument to launch the OxygendiffFiles.sh file (for example: sh '/Applications/Oxygen XML Editor/diffFiles.sh').
- Arguments - Enter -ext $REMOTE $LOCAL $LOCAL.
- Merge Tool - Select Custom.
- Diff Command - Enter a command-line argument to launch the OxygendiffFiles.sh file (for example: sh '/Applications/Oxygen XML Editor/diffFiles.sh').
- Arguments - Enter -ext $LOCAL $REMOTE $BASE $MERGED.
- Close the preferences dialog box.Result: In SourceTree, you can now compare file changes with the OxygenCompare Files tool by simply selecting External Diff from the contextual menu or Actions menu.