LLM-based vs. Search-based Merge Conflict Resolution: An Empirical Study of Competing Paradigms

Heleno de Souza Campos Junior, Leonardo Gresta Paulino Murta

Context: The resolution of software merge conflicts is being reshaped by two competing paradigms: generative approaches based on Large Language Models (LLMs) and optimization appro…