Conflict Resolution

Conflicting feature(s)

Conflicting field

Versions

Conflicting FeatureClass

Conflicts are automatically detected

Editing, Long Transaction and Versioning

Options to resolve conflict