Skip to main content

smart_merge

nusy_codegraph::git_tools

Function smart_merge 

Source 
pub fn smart_merge(
    base_batch: &RecordBatch,
    ours_batch: &RecordBatch,
    theirs_batch: &RecordBatch,
    edges_batch: &RecordBatch,
) -> Result<SmartMergeResult>
Expand description

Smart 3-way merge with interaction warning detection.

Wraps codegraph_merge and additionally detects when both branches modify different callers of a shared dependency — a potential interaction risk even though there’s no direct conflict.