Struct MergeCommits 

pub struct MergeCommits { /* private fields */ }

Merge two commits as trees (without touching the working directory).

Examples

use ironflow_ops_git::merge::MergeCommits;
use ironflow_core::operation::Operation;

let op = MergeCommits::new("/path/to/repo", "abc123", "def456");
assert_eq!(op.kind(), "git");

Implementations

impl MergeCommits

pub fn new( repo_path: impl Into<PathBuf>, our_oid: impl Into<String>, their_oid: impl Into<String>, ) -> Self

Create a new merge-commits operation.

pub async fn run( &self, _ctx: &OperationContext, ) -> Result<MergeConflictOutput, OperationError>

Execute and return a typed result.

Trait Implementations

impl Operation for MergeCommits

fn kind(&self) -> &str

A short, lowercase identifier for this operation type.

fn execute<'life0, 'life1, 'async_trait>( &'life0 self, ctx: &'life1 OperationContext, ) -> Pin<Box<dyn Future<Output = Result<Value, OperationError>> + Send + 'async_trait>>

where Self: 'async_trait, 'life0: 'async_trait, 'life1: 'async_trait,

Execute the operation and return the result as JSON.

fn input(&self) -> Option<Value>

Optional JSON representation of the operation input, stored in the step’s input column for observability.

impl TypedOperation for MergeCommits

type Output = MergeConflictOutput

The concrete output type that Operation::execute produces.