
By default it is C:\Program Files\Devart\Code Compare. Use you product installation folder instead of.
#Smartsvn conflict solver windows#
#Smartsvn conflict solver code#
To integrate Code Compare into TortoiseSVN, follow the instructions below. Use the following arguments for this command:

Go to Edit->Preferences->File Compare->->Edit…->External comparator and specify the following command: SmartSVN Integration To select Code Compare as a diff tool in SmartSVN, perform the following steps:

In the View menu of RapidSVN, select Preferences->Programs->Diff Tool.To select Code Compare as a merge tool in RapidSVN, perform the following steps: In the View menu of RapidSVN, select Preferences->Programs->Diff Tool menu.Įnter the following string as an argument:.RapidSVN Integration To select Code Compare as a diff tool in RapidSVN, perform the following steps: In both cases ** is the path to the product. Merge tool: “\CodeMerge.exe” /SC=SVN /REMOVEFILES /BF=”$(Base)” /BT=”$(BaseName)” Go to the Subversion User Tools node and specify diff and merge tools.ĭiff tool: \CodeCompare.exe” /SC=SVN /t1=”$(BaseName)” /t2=”$(MineName)” “$(Base)” “$(Mine)” Go to the Plug-in Selection tab and select the AnkhSVN - Subversion support for Visual Studio item from the Current source control plug-in

It provides the option to either resolve the conflict manually or use the three-way merge feature to edit the resulting file. It ensures that the same part of a file is never changed at the same time by two or more team members.
