How to interactively (visually) resolve conflicts in SourceTree / git

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:

  1. How to resolve merge conflicts in a Git repository
  2. Git: cannot do a partial commit during a merge (SourceTree)
  3. What is the best (and safest) way to merge a Git branch into master?
  4. Undo a Git merge that hasn’t been pushed yet
  5. Git merge hotfix branch into feature branch
  6. Abort a Git Merge
  7. Handling file renames in Git
  8. Why are there two ways to unstage a file in Git?
  9. ‘git’ is not recognized as an internal or external command
  10. ‘git’ is not recognized as an internal or external command
  11. How can I merge multiple commits onto another branch as a single squashed commit?
  12. How can I merge multiple commits onto another branch as a single squashed commit?
  13. Why does git say “Pull is not possible because you have unmerged files”?
  14. Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch
  15. Git – remote: Repository not found
  16. How to remove origin from git repository
  17. What’s the purpose of git-mv?
  18. The following untracked working tree files would be overwritten by merge, but I don’t care
  19. git : Pull is not possible because you have unmerged files
  20. Why does git say “Pull is not possible because you have unmerged files”?
  21. Why git asks to enter a commit message to explain why this merge is necessary
  22. The following untracked working tree files would be overwritten by merge, but I don’t care
  23. Undo git pull, how to bring repos to old state
  24. How do I remove version tracking from a project cloned from git?
  25. Undo git pull, how to bring repos to old state
  26. How do I remove version tracking from a project cloned from git?
  27. git pull on a different branch
  28. Git error on commit after merge – fatal: cannot do a partial commit during a merge
  29. Is there a “theirs” version of “git merge -s ours”?
  30. Download a specific tag with Git
  31. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  32. The following untracked working tree files would be overwritten by merge, but I don’t care
  33. Git push won’t do anything (everything up-to-date)
  34. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  35. Is there a “theirs” version of “git merge -s ours”?
  36. git add . -> still “nothing to commit” with new files
  37. Why does git say “Pull is not possible because you have unmerged files”?
  38. git submodule add error: does not have a commit checked out
  39. Git error on git pull (unable to update local ref)
  40. git status shows modifications, git checkout — doesn’t remove them
  41. How to resolve git’s “not something we can merge” error
  42. ‘cannot open git-upload-pack’ error in Eclipse when cloning or pushing git repository
  43. How to clone all remote branches in Git
  44. Update Git branches from master
  45. Get changes from master into branch in Git
  46. How to squash all git commits into one?
  47. How can I delete all of my Git stashes at once?
  48. SourceTree keeps asking for Github password
  49. Is it possible to pull just one file in Git?
  50. How to resolve git status “Unmerged paths:”?
  51. git add only modified changes and ignore untracked files
  52. Remove node_modules from git in vscode
  53. What’s the use of the staging area in Git?
  54. How to keep a branch synchronized/updated with master?
  55. Resolve Git merge conflicts in favor of their changes during a pull
  56. git push –force-with-lease vs. –force
  57. Found a swap file by the name
  58. How can I move a tag on a git branch to a different commit?
  59. Is there a git-merge –dry-run option?
  60. Git pull – Please move or remove them before you can merge
  61. Sourcetree adding files in global .gitignore, not in repository .gitignore
  62. I use SourceTree with Git but need to work with SVN repistory, what options do I have?
  63. What firewall ports need to be open to allow access to external git repositories?
  64. How do I prevent apache from serving the .git directory?
  65. api-ms-win-crt-runtime-l1-1-0.dll is missing when opening Microsoft Office file [closed]
  66. Istio Ingress resulting in “no healthy upstream”
  67. What is a LAMP stack?
  68. What is the difference between POST and PUT in HTTP?
  69. How to use Git Revert
  70. What and where are the stack and heap?
  71. What is a reverse shell?
  72. Why am I getting error for apple-touch-icon-precomposed.png
  73. How do I properly force a Git push?
  74. ssh remote host identification has changed
  75. How do I resolve git saying “Commit your changes or stash them before you can merge”?
  76. How to link to part of the same document in Markdown?
  77. In C++, what is wx.h?
  78. How to UPSERT (MERGE, INSERT … ON DUPLICATE UPDATE) in PostgreSQL?
  79. What is the difference between allFile and allMarkdownRemark in gatsby
  80. My new Github page isn’t showing up
  81. What is the difference between clang (and LLVM) and gcc / g++?
  82. Simplest way to profile a PHP script
  83. All com.android.support libraries must use the exact same version specification
  84. Git push existing repo to a new and different remote repo server?
  85. How can I run a program from a batch file without leaving the console open after the program starts?
  86. Specify an SSH key for git push for a given domain
  87. Get a list of URLs from a site
  88. How do I “un-revert” a reverted Git commit?
  89. How to get parameter value from query string?
  90. How to use Git and Dropbox together?
  91. Difference between Chocolatey and NuGet
  92. Regex multiple match substring
  93. How to make a redirection that fired a script before redirecting?
  94. Deploying Updated or New Plugins That Modify the wp_options Table
  95. SymmetricDS in dev + prod workflow?
  96. How to make a copy of a local wordpress build in MAMP?
  97. Any benefit or detriment from removing a pagefile on an 8 GB RAM machine?
  98. How do I view the details of a digital certificate .cer file?
  99. How do you validate fstab without rebooting?
  100. DNS – NSLOOKUP what is the meaning of the non-authoritative answer?

Leave a Comment