Struct WorkspaceMerge 

pub struct WorkspaceMerge {
    pub id: Uuid,
    pub source_workspace_id: Uuid,
    pub target_workspace_id: Uuid,
    pub base_commit_id: Uuid,
    pub source_commit_id: Uuid,
    pub target_commit_id: Uuid,
    pub merge_commit_id: Option<Uuid>,
    pub status: MergeStatus,
    pub conflict_data: Option<Value>,
    pub merged_by: Option<Uuid>,
    pub merged_at: Option<DateTime<Utc>>,
    pub created_at: DateTime<Utc>,
}

Workspace merge operation

Fields

id: Uuid

Unique merge ID

source_workspace_id: Uuid

Source workspace ID (being merged FROM)

target_workspace_id: Uuid

Target workspace ID (being merged INTO)

base_commit_id: Uuid

Common ancestor commit ID

source_commit_id: Uuid

Latest commit from source workspace

target_commit_id: Uuid

Latest commit from target workspace

merge_commit_id: Option<Uuid>

Resulting merge commit ID (None if not completed)

status: MergeStatus

Merge status

conflict_data: Option<Value>

Conflict data (JSON array of conflicts)

merged_by: Option<Uuid>

User who performed the merge

merged_at: Option<DateTime<Utc>>

When the merge was completed

created_at: DateTime<Utc>

When the merge was created

Implementations

impl WorkspaceMerge

pub fn new( source_workspace_id: Uuid, target_workspace_id: Uuid, base_commit_id: Uuid, source_commit_id: Uuid, target_commit_id: Uuid, ) -> Self

Create a new merge operation

Trait Implementations

impl Clone for WorkspaceMerge

fn clone(&self) -> WorkspaceMerge

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for WorkspaceMerge

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for WorkspaceMerge

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl<'a, R: Row> FromRow<'a, R> for WorkspaceMerge

where &'a str: ColumnIndex<R>, Uuid: Decode<'a, R::Database> + Type<R::Database>, Option<Uuid>: Decode<'a, R::Database> + Type<R::Database>, MergeStatus: Decode<'a, R::Database> + Type<R::Database>, Option<Value>: Decode<'a, R::Database> + Type<R::Database>, Option<DateTime<Utc>>: Decode<'a, R::Database> + Type<R::Database>, DateTime<Utc>: Decode<'a, R::Database> + Type<R::Database>,

fn from_row(__row: &'a R) -> Result<Self>

impl Serialize for WorkspaceMerge

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.