Am using Source Tree version 2.4.7.0. In Previous versions, they had an option for resolving the conflicts with external merge tool. But in this new version, no option is available to resolve the conflicts. To resolve the conflicts, we have open the file manually.