
|
Move to the previous conflict in element tree.
|

|
Move to the next conflict in element tree. |

|
Overwrite all conflicts.
|

|
Revert all conflicts. |

|
Reset all conflicts. |

|
Overwrite the selected conflict in tree. |

|
Revert the selected conflict in tree. |

|
Reset the selected conflict in tree. |

|
Select the previous change in tree. |

|
Select the next change in tree. |
| Current Name |
The value of name of the committing/updating copy. |
| Original Name |
The value of name of the original copy. |
| Conflict Name |
The value of name of the server copy. |
| Last Modified |
The user who modified last time. |
| Conflict Revision |
The revision that cause conflict with the committing/updating action. |
| [Overwrite] |
Click on overwrite the conflict selected in tree. |
| [Revert] |
Click on revert the conflict selected in tree. |