You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
System message:
```
mac OS Monterey
version: 12.2.1
```
Sourcetree application info:
```
version: 4.1.6(242)
embedded git 2.31.0
embedded git-lfs 2.13.2
embedded git-flow
embedded mercurial 4.6.1
```
Git config:
```
http.sslverify=false
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.smudge=git-lfs smudge -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
core.excludesfile=/Users/keroming/.gitignore_global
difftool.sourcetree.cmd=/usr/local/bin/bcomp "$LOCAL" "$REMOTE"
difftool.sourcetree.path=-ro
mergetool.sourcetree.cmd=/usr/local/bin/bcomp "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
mergetool.sourcetree.trustexitcode=true
commit.template=/Users/keroming/.stCommitMsg
mergetool.keepbackup=false
```
Problem:
When I merged other branches, I tried to use external merge tool to resolve conflicts, but I found that the external merge tool could not be launched, try to switch various external tools, can't start
So I run the following command under the project.
```
git mergetool -y --tool=sourcetree -- src/business/api/bot.ts
```
This command output:
```
Merging:
src/business/api/bot.ts
Deleted merge conflict for 'src/business/api/bot.ts':
{local}: deleted
{remote}: modified file
Use (m)odified or (d)eleted file, or (a)bort?
```
I have seen someone in a long time, I have fed back such a problem, and no one explains what the specific reason is how to solve this problem.
I am now the latest version, I can't make a version upgrade.
So this problem is repeated and can't be cured?