Command: Resolve Conflict

Symbol:

Function: The command opens the <object> dialog. In the dialog, the conflicts are displayed and functions for resolving conflicts are prepared in order to merge changes.

Call: Context menu of the object

Requirement: The object has a conflict which has occurred by updating the object with local changes.

Dialog: <object>

Compare	The local objects are displayed on the left side, and the version from the SVN repository is displayed on the right side.
Use mine	The local change is used.
Use yours	The change of the version from the SVN repository is used.
Apply	All changes are accepted that you made in this dialog. The status of the object is changed.
Cancel	Cancels all changes that you made in this dialog However, the object keeps the "conflicted" status.