difference tree
- You can check the following information in the difference tree.
Name | Description |
---|---|
Status Icons | Displays the following icons. : Icon representing conflict : Icon representing conflict resolved |
Name | Displays the name of the element. |
Data Type | Displays the data type. |
Other side | Displays the value of the far side. |
Base | Shows the base value. |
My Side | Shows the value of your side. |
After applying the merge | Displays 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. |