Resolve merge conflicts

This topic describes how to resolve merge conflicts in the upgrade or import process.

Note

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.

Theme Designer uses the KDiff3 tool (shipped with the Theme Designer) that performs the three-way merge to upgrade/import a theme. When a merge conflict occurs, you will see the following window:

Upgrade: Conflicts Message

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:

Kdiff3 Window

The KDiff3 tool uses the following sets of files to resolve upgrade merge conflicts:

  • the old version of the original DevExpress theme (the parent theme stored within your custom theme) (file 'A'). In theme structure, this file set is stored in the Your_Theme_Folder\.td\Origin folder;
  • the old version of your custom theme (file 'B'). In theme structure, this file set is stored in the Your_Theme_Folder\.td\Sources folder;
  • the latest version of the original DevExpress theme (file 'C'). In theme structure, this file set is stored in the DevExpress WPF Controls folder;

Follow the kdiff3 merging topic for more information about conflicts resolving in the KDiff3 tool.