|
Select previous conflict: Select the previous conflict you made in current copy.
Select next conflict: Select the next conflict you made in current copy when a conflict is found during committing.
Overwrite all conflicts: Keep all modification you made in current copy when a conflict is found during committing.
Revert all conflicts: Accept all modification other team members made previously and discard all your modification when a conflict is found during committing.
Reset all conflicts: Cancel the decision you have just made for dealing with all conflicts when a conflict is found during committing.
Overwrite selected conflicts: Keep the selected modification you made in current copy when a conflict is found during committing.
Revert selected conflicts: Accept the selected modification other team members made in current copy when a conflict is found during committing.
Reset selected conflicts: Cancel the decision you have just made for dealing with the select conflict(s) when a conflict is found during committing.
Select previous change: Select the previous modification you have made in the sequence of list displaying in Display window.
Select next change: Select the next modification you have made in the sequence of list displaying in Display window.
|