Skip to main content

difference tree

  • You can check the following information in the difference tree.

difference tree

NameDescription
Status IconsDisplays the following icons.
Conflict: Icon representing conflict
Conflict resolved: Icon representing conflict resolved
NameDisplays the name of the element.
Data TypeDisplays the data type.
Other sideDisplays the value of the far side.
BaseShows the base value.
My SideShows the value of your side.
After applying the mergeDisplays the value after applying the merge.
You can also start editing by double-clicking or pressing the F2 key, and the finalized text will be reflected as the merge result.