to resolve the differences

SelectionVerificationAction SvnConflictResolver [...] ConflictsInfo SvnConflictResolver

[Guid] get_name ( resolve [...] . Parameters : resolve [...] conflictResolve = None ,

. Resolve the detected

resolve any conflicts

how this placeholder is resolved [...] property resolver_guid ¶ [...] how this placeholder is resolved

conflict resolver [...] or revert need to resolve [...] or revert need to resolve

(With |Resolve

taken to resolve

or has been resolved. This symbol