Struct MergeService 

pub struct MergeService { /* private fields */ }

Merge service for handling workspace merges

Implementations

impl MergeService

pub fn new(db: Pool<Sqlite>) -> Self

Create a new merge service

pub async fn find_common_ancestor( &self, source_workspace_id: Uuid, target_workspace_id: Uuid, ) -> Result<Option<Uuid>>

Find the common ancestor commit between two workspaces

This uses a simple approach: find the fork point if one exists, otherwise find the earliest common commit in both histories.

pub async fn merge_workspaces( &self, source_workspace_id: Uuid, target_workspace_id: Uuid, user_id: Uuid, ) -> Result<(Value, Vec<MergeConflict>)>

Perform a three-way merge between two workspaces

Merges changes from source_workspace into target_workspace. Returns the merged state and any conflicts.

pub async fn complete_merge( &self, merge_id: Uuid, user_id: Uuid, resolved_state: Value, message: String, ) -> Result<Uuid>

Complete a merge by creating a merge commit

pub async fn get_merge(&self, merge_id: Uuid) -> Result<WorkspaceMerge>

Get a merge by ID

pub async fn list_merges( &self, workspace_id: Uuid, ) -> Result<Vec<WorkspaceMerge>>

List merges for a workspace