Sourcetree does not launch Beyond compare external merge tool
Suddenly, when I try to launch "External merge tool" from Sourcetree, the tool does not appear. I say suddenly, because it worked last time I tried. The dialog remains forever:
Eventually I found this process related to the visual merge (dunno how to copy the command line from windows task manager):
This process, by the way, does not disappear when I press abort, so somebody probably didn't do their homework. Actually, I wouldn't probably notice it if there wasn't six same processes with this command line.
These are my settings:
How do I fix this? I need to merge project and I don't know what to do...
I found out that this happens when one of the files to be merged has been deleted. In that case, git prints out a command line prompt which sourcetree cannot handle. The git process then ends up hanging forever.
Best way to handle this is to kill the hanging git process and then make the choice manually using use mine/use theirs.
- GitVersion doesn't cause error in Azure Devops Pipeline
- Merging two git repository into another with Github actions
- Can I have two Libraries within one Azure Repo and install them using requirements.txt
- Git, fatal: The remote end hung up unexpectedly
- How to build git with static linking?
- Convert line-endings for whole directory tree (Git)
- How to add a changed file to an older (not last) commit in Git
- Show latest commit for a user across all branches
- How do I run git log to see changes only for a specific branch?
- How is it best to update a project when updates are provided as an archive?
- How to make 'git diff' ignore comments
- Can I hide a branch in a git repo for all remote clones?
- How do I get the Git commit count?
- Get the default upstream remote & branch for "git push"
- How to remove a pushed commit on GitHub?
- How to prune local tracking branches that do not exist on remote anymore?
- Target files with no file extension in .gitattributes
- What to do if git-am fails with "does not match index"?
- Does git support wildcards in paths?
- git alias ssh-add .gitconfig
- go get results in 'terminal prompts disabled' error for GitHub private repo
- How do I clone a Git repository into a specific folder?
- How to update my working Git branch from another branch (develop)?
- Merging 2 branches together in Git
- When to use "chore" as type of commit message?
- Git symbolic links in Windows
- Azure Devops 'git' is not recognized as an internal or external command on my Release pipeline
- In git, what does `--` (dash dash) mean?
- What is fast-forwarding?
- Jenkins: Error connecting to a GIT repository