Operation-Based Refactoring-Aware Merging: An Empirical Evaluation

Dealing with merge conflicts in version control systems is a challenging task for software developers. Resolving time-consuming and error-prone process, which distracts developers from important tasks. Recent work shows that refactorings are often involved refactoring-related tend to be larger, making them harder resolve. In the literature, there two refactoring-aware merging techniques claim automatically resolve conflicts; however, these have never been empirically compared. this paper, we present RefMerge , rejuvenated Java-based design implementation of first technique, an operation-based algorithm. We compare Git state-of-the-art graph-based tool, xmlns:xlink="http://www.w3.org/1999/xlink">IntelliMerge on 2,001 scenarios 20 open-source projects. find resolves or reduces 497 (25%) while increasing conflicting LOC only 214 (11%) scenarios. On other hand, 478 (24%) but increases 597 (30%) additionally conduct qualitative analysis differences between three algorithms provide insights strengths weaknesses each tool. does well ordering formatting conflicts, it struggles class-level several refactorings. resilient number scenario, introduces when inverting move-related