5 packages tagged with “conflict”
A tool to intelligently resolve merge conflicts in Jujutsu VCS. Port of git-mediate to C#.
一个轻量、零依赖的 .NET 库，用于一劳永逸地解决插件化应用（如AutoCAD, Revit, VSTO）中的“DLL地狱”问题。自动处理程序集加载冲突，无需修改宿主程序配置。A lightweight, zero-dependency .NET library to permanently fix "DLL Hell" in plugin-based applications (e.g., AutoCAD, Revit, VSTO). Automatically resolves assembly loading conflicts without touching the host's configuration.
Cross-repository file synchronization tool using intelligent iterative merging to unify multiple file versions with interactive conflict resolution.
Cross-repository file synchronization tool that uses intelligent iterative merging to unify multiple file versions with interactive conflict resolution. Features include batch processing with custom search paths and exclusion patterns, parallel file hashing for performance, persistent command history, and comprehensive automation capabilities for multi-repository workflows. Supports advanced diff visualization, pattern-based file discovery, and discrete processing phases with real-time progress reporting.