Skip to main content

Module merge

Module merge 

Source

Structs§

MergeResult
Result of a merge operation

Enums§

FileStatus
Status of a file in three-way comparison (cache vs current vs new)
MergeStrategy
Strategy for handling merge conflicts

Functions§

merge_generated_code
Perform three-way merge: staging vs output vs cache
print_merge_summary
Print merge result summary with warnings for conflicts