GitMergeResult GitResolveFileConflictStrategy GitResolveFileConflict
Conflict Detection [...] conflicts. The ACD
conflicts occur regarding [...] . If no conflicts occur
, and is not conflicted. Multiple tabs
and not conflicted. Multiple tabs
and not conflicted. Multiple tabs
these conflicts. For conflicts [...] Conflicts to open a [...] -ID and COB-ID conflicts
should resolve the conflict