We have some integration between our Assets system and our ArcGIS 10.3.1 system. The ArcGIS SDE is versioned. The assets system uses its own version (lets call it 'Assets'), and there is another version, 'QA', that all the editors use (actually, they use their own child versions of 'QA', but lets keep it simple for now).
The assets system only integrates non-spatial attributes with the GIS features, not the geometries of features. In general, users are not permitted to change non-spatial attributes in the GIS, but only in the assets system. (This is a simplification, but will do for the purposes of this question.)
However, they can (and must) change spatial data (geometries) in the GIS.
Every night, an automated Python script reconciles and posts both of these versions to the DEFAULT version. In fact, the script runs twice every night so that the changes from each version get reconciled back to the other version, via DEFAULT.
The problem here is that if spatial data (geometry) is changed in the GIS and a non-spatial attribute is changed in the assets system on the same day, the reconcile/post will overwrite the changes in one of these (which ever gets reconciled last 'wins' and the changes in the other are lost).
The Python arcpy script uses the following line to run the reconcile/post:
arcpy.ReconcileVersions_management(workspace, "ALL_VERSIONS", "sde.DEFAULT", versionList, "LOCK_ACQUIRED", "NO_ABORT", "BY_OBJECT", "FAVOR_EDIT_VERSION", "POST", "KEEP_VERSION", reconcileLog)
versionList is a list of 'QA' and 'assets' versions).
I could change "NO_ABORT" to "ABORT_CONFLICTS", but that would just result in no reconcile/post occurring.
Is there any way to automatically log/notify of conflicts during this process? If set to "NO_ABORT", conflicts don't appear to be logged at all!
Even better, is there some way to automatically manage conflicts (eg, rule-based of some kind)?
Better still, when a conflict is detected between versions, is there some way to automatically retain the spatial data of the feature from one version and the non-spatial data of that feature from the other version?