GitResolveFileConflictStrategy ¶ class GitResolveFileConflictStrategy. GitResolveFileConflict
DefaultConflict [...] conflict resolution mode. Return type : SvnConflict
Completed = 38 ¶ TreeConflict [...] by excluding it. FailedConflict [...] in conflict FailedMissing =
subversion conflicts [...] conflict Parameters : [...] to the conflict. reporter ( Svn
. if there were tree conflicts [...] _ranges. property effective_conflict [...] the effective conflict
from the handler stack. PushCommitRecursionConflict [...] conflict handler. Parameters : handler ( SvnSelectionRecursionConflict
bool property TreeConflict [...] SvnConflict [...] .7. Use .IsConflicted
ModificationArgs.objects_were_removed is true. working_set_modification_conflict [...] SelectionModificationConflict [...] due to a conflict
S.CoDeSys.Git.GitIntegration.IGitPullOptions. property fail_on_conflict [...] , do not create conflicts [...] conflict. property
S.CoDeSys.Git.GitIntegration.IGitMergeOptions. property fail_on_conflict [...] , do not create conflicts [...] conflict. property