Search code examples
tortoisesvnconflict

How can I view a list of all files with conflicts in a Tortoise SVN Repository?


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


Solution

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

    TortoiseSVN right-click menu from version 1.8.8

    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:

    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."