Struct Resolver 

pub struct Resolver { /* private fields */ }

The main resolver that combines all strategies.

Implementations

impl Resolver

pub fn new(config: ResolverConfig) -> Self

pub fn resolve_file( &self, base: &str, left: &str, right: &str, ) -> FileResolverOutput

Resolve a three-way merge for complete file contents.

This is the main entry point. It first runs diff3 to identify conflict regions, then applies the resolution pipeline to each conflict.

pub fn resolve_conflict( &self, base: &str, left: &str, right: &str, ) -> ResolverOutput

Resolve a single conflict region using the full pipeline.