Expand description
Main conflict resolver pipeline.
Orchestrates the multi-strategy resolution approach, applying techniques in order of confidence from highest to lowest:
- Pattern rules (DSL) — highest confidence, instant (ICSE 2021)
- Structured merge (tree-level) — eliminates false conflicts (LASTMERGE 2025)
- Version Space Algebra — enumerates combinations (OOPSLA 2018)
- Search-based — evolutionary with parent similarity (TOSEM 2025)
The resolver stops at the first strategy that produces a resolution with sufficient confidence, or returns ranked candidates from all strategies.
Structs§
- File
Resolver Output - Output of resolving a complete file.
- Resolver
- The main resolver that combines all strategies.
- Resolver
Config - Configuration for the resolver pipeline.
- Resolver
Output - Result of the full resolution pipeline.