Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

External Merge Tool Not Launching

maxming
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
February 24, 2022

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?

 

 

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events