ModificationArgs.objects_were_removed is true. working_set_modification_conflict [...] SelectionModificationConflict [...] due to a conflict
as conflicts : The objects [...] . All changes with a conflict are marked as "Conflicted
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
conflicts . Merge Conflict Strategy [...] . Fail on conflict (do
as "Conflicted object [...] and the message Conflicted [...] as "Conflicted object
Schedule SvnOperation SvnConflictAction SvnConflictReason SvnConflictType Svn
MergeStatus-Enum with the Codesys Conflicts [...] -fast-forward merge. Conflicts = 3 [...] in git conflicts
Object Name conflict [...] declaration Name conflict [...] Name conflict
) If conflicts occur [...] . If a conflict [...] . For conflict resolution