MergeConflict

Represents a merge conflict.

JSON representation 
{
  "entityInWorkspace": {
    object (Entity)
  },
  "entityInBaseVersion": {
    object (Entity)
  }
}
Fields
entityInWorkspace

object (Entity)

The workspace entity that has conflicting changes compared to the base version. If an entity is deleted in a workspace, it will still appear with a deleted change status.
entityInBaseVersion

object (Entity)

The base version entity (since the latest sync operation) that has conflicting changes compared to the workspace. If this field is missing, it means the workspace entity is deleted from the base version.