SourceTree filemerge立即退出并创建4个文件。如何解决它？ [英] SourceTree filemerge quits immediately and creates 4 files. How to fix it?

问题描述

昨天我可以将sourcetree中的文件与外部工具文件合并器合并。今天，sourcetree希望我注册我，在我成功注册后，我无法启动文件合并。

当我从文件的上下文菜单中选择启动外部差异工具时，会出现4个文件（备份文件，基本文件，本地文件和远程文件），但文件合并器会立即退出。 p>

启动外部差异时，filemerge显示在左侧/ dev / null中作为源。我该如何解决它？在首选项中，我选择filemerge作为外部差异工具。我是否需要手动为源代码树编写diff命令，才能为我的文件提供正确的本地版本？

谢谢

解决方案

我解决了这个问题问题。

如果您与其中一个分支中不存在的文件发生合并冲突，filemerge会立即退出。

yesterday I could merge files in sourcetree with the external tool filemerge. Today, sourcetree wanted me to register me, and after my successful registration, I couldnt start filemerge.

When I choose "Launch external diff tool" from the contextmenu of a file, 4 files appear (Backup, base, local and remote) but filemerge quits immediately.

When I launch external diff, filemerge displays in the left /dev/null as source. How can I fix it? In preferences I choose filemerge as external diff tool. Have I to write the diff command for source tree manually, to give it the right local version of my file? How can I do it?

Thanks

解决方案

I solved the problem.

If you have a merge conflict with a file that doesnt exist in one of the branches, filemerge quits immediately.

这篇关于SourceTree filemerge立即退出并创建4个文件。如何解决它？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！