Launch External Merge Tool For Sourcetree Mac Software

I’m using github for a large project with multiple developers – there have been a few wrinkles using the github mac client so we switched to SourceTree – a free github client. We’re using it to implement gitflow – I’ve been very happy with it so far – below is our process…

Hi Andrew, The built-in SourceTree documents provide the help. Here's an extract: Here is where you set the external diff/merge tools. SourceTree has in-built support for FileMerge, DiffMerge, Araxis Merge, KDiff3 and more, but if you wish to use another tool you can select 'Other' and provide your own tool information. To disable it open a command line and enter git config -global mergetool.keepBackup false; To resolve a conflict, right click on a conflicted file in SourceTree, Resolve Conflicts Launch External Merge Tool, resolve conflicts in Visual Studio and finish by clicking Accept Merge. That’s all there is to it. This is because in the Free Tier, users can only (1) Keep File (ver 1), (2) Keep File (ver 2), (3) Auto-merge, or (4) Use External Merge Tool. In addition, using External Merge Tools is very limited because GitKraken (all tiers) restricts External Merge Tools to only those it managed to Auto-detect. It also does not support custom arguments for. Open sublime, and get to the state of conflict just prior to running the merge command; Open command palette, and run the command 'GitSavvy: enable logging' Perform the failing 'Launch external merge tool' command. Run the command 'GitSavvy: disable logging' Run the command 'GitSavvy: view recorded log', save the file and attach it here. I can’t get Araxis Merge to work with an actual 3-way merge. Launching an external diff works properly, but the “Resolve Conflicts-Launch External Merge Tool” just quickly opens the external merge window and then closes it. I also see the.orig files building up in the folder.

Before you start a new feature

make sure you have the latest copy of the dev branch (do a fetch on remote, then pull if dev branch shows any changes)
use gitflow command ‘new feature’ and name it
make your changes to code
stage files, then commit and push all changes to your feature branch
before finishing feature (merging with development) – use fetch to check status of development branch,
- if there have been commits by other members of the team since you downloaded the development branch you will need to merge those changes to your feature branch before finishing the feature
  - checkout the development branch, then pull it to get current
  - re-checkout your new feature branch
  - use gitflow ‘finish current’ (set to ‘delete branch’ and ‘force delete’)
  - merge conflict message, go to working copy, right click resolve conflicts – launch external merge tool, choose resolution, file save merge, quit merge tool (do not quit merge tool until you’re done with all merges
  - commit and push merge results
  - now push the new dev branch
- if there are no merge issues then just push the new dev branch up to the remote origin
push develop changes up to remote (if not done already)
check github site to confirm your changes are present (just until you are comfortable with this process)

Our favorite (and free) visual diff and merge tool for OS X (as well as Linux and Windows) is DiffMerge. It makes resolving nasty Git branch conflicts a snap (relatively speaking). Here’s how to install it and configure it with Git on OS X: Bijoy banno windows 10.

Download the DiffMerge OS X installer. Be sure to download the Installer version. There’s also a DMG version but then you’ll have to manually install the diffmerge command line script.
Once you’ve downloaded it go into terminal and make sure you can run it from the command line by typing diffmerge and hitting return.

To configure Git to use DiffMerge run these commands from the command line:

git config--global diff.tool diffmerge
git config--global difftool.diffmerge.cmd 'diffmerge '$LOCAL' '$REMOTE'
git config--global merge.tool diffmerge
git config--global mergetool.diffmerge.cmd 'diffmerge --merge --result='$MERGED' '$LOCAL' '$(if test -f '$BASE'; then echo '$BASE'; else echo '$LOCAL'; fi)' '$REMOTE'
git config--global mergetool.diffmerge.trustExitCode true

Now, whenever you want it to launch diffs just use difftool where you’d normally use diff:

Launch external merge tool for sourcetree mac software

# diff the local file.m against the checked-in version
git difftool file.m
# diff the local file.m against the version in some-feature-branch
git difftool some-feature-branch file.m
# diff the file.m from the Build-54 tag to the Build-55 tag
git difftool Build-54.Build-55 file.m

To resolve merge conflicts, just run git mergetool:

Launch External Merge Tool For Sourcetree Mac Software

Related