Rover: Context-aware Conflict Resolution with LLM

In three linesRover is a code merge conflict resolution system combining program analysis with LLMs. It introduces Multi-layer Code Property Graph (MtCPG) to capture inter-file dependencies and uses graph connectivity algorithms to create meaningful contexts. Evaluation: Rover outperforms standalone LLMs, MergeGen, and WizardMerge at character, lexical, and semantic levels.

Summary generated by Claude — human-verified