GitResolveFileConflictStrategy ¶ class GitResolveFileConflictStrategy. GitResolve

Failed = 5 ¶ Resolved = [...] FromChangeList = 31 ¶ Resolved = [...] be resolved. Never = 3 ¶

, that have been resolved automatically [...] resolve_file_conflict_strategy : GitResolve

, that have been resolved automatically [...] resolve_file_conflict_strategy : GitResolve

_permission_state ( group , resolve_effective = True , resolve [...] . resolve_effective (

info ( SvnConflictResolver [...] of the conflict resolver. st [...] resolver. executor (

, bResolve = [...] ObjectId ) – The id. bResolve [...] resolving the object ID

GitMergeResult GitResolveFileConflictStrategy GitResolve

Kind. ResolveRevision ( revision ) ¶ Resolves a [...] The resolved numeric

ImportResult NativeImportResolve Formatting ConflictResolve [...] SelectionVerificationAction SvnConflictResolver