1. class
  2. Google
  3. \
  4. Service
  5. \
  6. TagManager
  7. \
  8. MergeConflict

MergeConflict

class MergeConflict extends Model (View source)

Properties

protected $entityInBaseVersionType
protected $entityInBaseVersionDataType
protected $entityInWorkspaceType
protected $entityInWorkspaceDataType

Methods

setEntityInBaseVersion(Entity $entityInBaseVersion)

No description

Entity
getEntityInBaseVersion()

No description

setEntityInWorkspace(Entity $entityInWorkspace)

No description

Entity
getEntityInWorkspace()

No description

Details

at line 30
setEntityInBaseVersion(Entity $entityInBaseVersion)

No description

Parameters

Entity $entityInBaseVersion

at line 37
Entity getEntityInBaseVersion()

No description

Return Value

Entity

at line 44
setEntityInWorkspace(Entity $entityInWorkspace)

No description

Parameters

Entity $entityInWorkspace

at line 51
Entity getEntityInWorkspace()

No description

Return Value

Entity