From SourceTree, click on Tools->Options. Then on the “General” tab, make sure to check the box to allow SourceTree to modify your Git config files.
Then switch to the “Diff” tab. On the lower half, use the drop down to select the external program you want to use to do the diffs and merging. I’ve installed KDiff3 and like it well enough. When you’re done, click OK.
Now when there is a merge, you can go under Actions->Resolve Conflicts->Launch External Merge Tool.
Related Posts:
- How to resolve merge conflicts in a Git repository
- Git: cannot do a partial commit during a merge (SourceTree)
- What is the best (and safest) way to merge a Git branch into master?
- Undo a Git merge that hasn’t been pushed yet
- Git merge hotfix branch into feature branch
- Abort a Git Merge
- Handling file renames in Git
- Why are there two ways to unstage a file in Git?
- ‘git’ is not recognized as an internal or external command
- ‘git’ is not recognized as an internal or external command
- How can I merge multiple commits onto another branch as a single squashed commit?
- How can I merge multiple commits onto another branch as a single squashed commit?
- Why does git say “Pull is not possible because you have unmerged files”?
- Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch
- Git – remote: Repository not found
- How to remove origin from git repository
- What’s the purpose of git-mv?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- git : Pull is not possible because you have unmerged files
- Why does git say “Pull is not possible because you have unmerged files”?
- Why git asks to enter a commit message to explain why this merge is necessary
- The following untracked working tree files would be overwritten by merge, but I don’t care
- Undo git pull, how to bring repos to old state
- How do I remove version tracking from a project cloned from git?
- Undo git pull, how to bring repos to old state
- How do I remove version tracking from a project cloned from git?
- git pull on a different branch
- Git error on commit after merge – fatal: cannot do a partial commit during a merge
- Is there a “theirs” version of “git merge -s ours”?
- Download a specific tag with Git
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- The following untracked working tree files would be overwritten by merge, but I don’t care
- Git push won’t do anything (everything up-to-date)
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- Is there a “theirs” version of “git merge -s ours”?
- git add . -> still “nothing to commit” with new files
- Why does git say “Pull is not possible because you have unmerged files”?
- git submodule add error: does not have a commit checked out
- Git error on git pull (unable to update local ref)
- git status shows modifications, git checkout —
doesn’t remove them - How to resolve git’s “not something we can merge” error
- ‘cannot open git-upload-pack’ error in Eclipse when cloning or pushing git repository
- How to clone all remote branches in Git
- Update Git branches from master
- Get changes from master into branch in Git
- How to squash all git commits into one?
- How can I delete all of my Git stashes at once?
- SourceTree keeps asking for Github password
- Is it possible to pull just one file in Git?
- How to resolve git status “Unmerged paths:”?
- git add only modified changes and ignore untracked files
- Remove node_modules from git in vscode
- What’s the use of the staging area in Git?
- How to keep a branch synchronized/updated with master?
- Resolve Git merge conflicts in favor of their changes during a pull
- git push –force-with-lease vs. –force
- Found a swap file by the name
- How can I move a tag on a git branch to a different commit?
- Is there a git-merge –dry-run option?
- Git pull – Please move or remove them before you can merge
- Sourcetree adding files in global .gitignore, not in repository .gitignore
- I use SourceTree with Git but need to work with SVN repistory, what options do I have?
- What firewall ports need to be open to allow access to external git repositories?
- How do I prevent apache from serving the .git directory?
- How do I check out a remote Git branch?
- How do I delete a Git branch locally and remotely?
- How do I use ‘git reset –hard HEAD’ to revert to a previous commit? [duplicate]
- What is git tag, How to create tags & How to checkout git remote tag(s)
- Using prevNext Modx Addon
- :wq! command in vim
- How do I delete a Git branch locally and remotely?
- how to set the background color of the status bar during the launching phase [duplicate]
- api-ms-win-crt-runtime-l1-1-0.dll is missing when opening Microsoft Office file [closed]
- How do I rename a local Git branch?
- When is K 1024 and when is it 1000?
- What is a MIME type?
- Logitech/LGHUB Lua – Loop with break
- What does ‘–set-upstream’ do?
- are there dictionaries in javascript like python?
- What does ‘–set-upstream’ do?
- How can I convert MP3 file to a Base64 encoded string? [closed]
- Understanding The Modulus Operator %
- Difference between “git add -A” and “git add .”
- Understanding the main method of python [duplicate]
- Dial pad to get phone number (with Android button images)
- TypeError: only integer scalar arrays can be converted to a scalar index with 1D numpy indices array
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- How is the AND/OR operator represented as in Regular Expressions?
- TypeError: only integer scalar arrays can be converted to a scalar index with 1D numpy indices array
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- error: src refspec master does not match any
- Istio Ingress resulting in “no healthy upstream”
- Why is it not possible to fake an IP address?
- How to open a “-” dashed filename using terminal?
- What does cherry-picking a commit with Git mean?
- Substring in excel
- How to cherry pick from 1 branch to another
- What is a LAMP stack?
- What is a sanity test/check
- What is the difference between POST and PUT in HTTP?