Resolve Merge Conflicts

• Jan 18, 2022

This topic describes how to resolve merge conflicts when you upgrade or import a theme.

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 see the following window:

In this window, choose files you want to resolve, and click Resolve Selected or Resolve All. The Kdiff3 tool opens files you have chosen:

The KDiff3 tool uses three input directories to resolve upgrade merge conflicts:

• The original DevExpress theme’s old version (the parent theme stored within your custom theme) (file ‘A‘). It is stored in the Your_Theme_Folder\.td\Origin folder.
• Your custom theme’s old version (file ‘B‘). It is stored in the Your_Theme_Folder\.td\Sources folder.
• The original DevExpress theme’s latest version (file ‘C‘). It is stored in the DevExpress WPF Controls folder.

Follow the kdiff3 merge topic for more information on conflicts resolving in the KDiff3 tool.