如何在Tortoise SVN存储库中查看所有有冲突的文件的列表？ [英] How can I view a list of all files with conflicts in a Tortoise SVN Repository?

问题描述

是否可以使用Tortoise SVN获取处于（SVN）冲突状态的文件列表？

Is there any way to get a list of files that are in a (SVN) conflicted state using Tortoise SVN?

推荐答案

为此，请右键单击包含您希望看到的冲突的文件夹，然后单击解决... 。

To do this, right-click on the folder containing the conflicts you wish to see, then click Resolve....

请注意，这是一个副作用，因为此选项（通常）用于将冲突标记为已解决。但是，它也可以帮助您实际找到并解决冲突。行为如下：

Note that this is something of a side-effect, since this option is (generally) for marking conflicts as resolved. It is also, however, intended to help you actually find and resolve the conflicts. The behavior is as follows:

将出现一个窗口，其中列出了所有文件冲突，并在其旁边带有复选框。如果双击文件名，Tortoise将弹出该文件的合并窗口。选择要标记为已解决的文件（使用复选框）后，可以单击确定，也可以直接退出窗口，而无需单击取消来更改任何冲突的解决状态。

A window will appear that lists all the file conflicts, with check-boxes next to them. If you double-click on a file name, Tortoise will bring up the Merge window for that file. When you've selected the files you want to mark as resolved (using the check-boxes), you can do so by clicking "Ok," or you can simply exit the window without changing the resolution status of any conflicts by clicking "Cancel."

这篇关于如何在Tortoise SVN存储库中查看所有有冲突的文件的列表？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！