This topic describes how to resolve merge conflicts in the upgrade or import process.
Theme Designer uses the difftool to merge files. In some situations, the difftool cannot automatically merge all conflicts. In this cases, the Theme Designer opens the KDiff3 tool for manual conflicts resolving.
Еven if there are no merge conflicts, the resulted XAML still may be not valid. You will see corresponding errors during the compilation process. In this case, you will need to manually correct the corresponding XAML parts.
In this window, choose files you want to resolve, and click the Resolve Selected button or the Resolve All button to resolve all files. The Kdiff3 tool will open files you have chosen:
The KDiff3 tool uses the following sets of files to resolve upgrade merge conflicts:
Follow the kdiff3 merging topic for more information about conflicts resolving in the KDiff3 tool.