Electronic Notes in Theoretical Computer Science · 2004 · 37 citations · 9 references
ComputingComputer ScienceChange ImplementationSoftware EngineeringTeamworkAbstract Syntax TreesSoftware MaintenanceSoftware RefactoringSoftware ReuseVersion ControlVersion Control SystemsMerge Conflict DetectionMerging AlgorithmsRefactoringRefactoring DetectionSource Tree Conflict ResolutionVersioning
To fully support refactorings in a team development environment we have implemented a refactoring-aware repository provider as an extension plug-in to the Java Development Tools in Eclipse. The versioning system treats refactorings as first-class changes described as semantic ac- tions rather than the set of resulting changes scattered over the source tree. We also introduce refactoring-aware merge, which merges refactorings as well as traditional changes utilizing the se- mantics of the refactorings to detect and resolve merge conflicts. It also ensures that the semantic meaning of a refactoring is preserved after the merge.
9
Refactoring improving the design of existing code
Mauricio A. Saca · 2017 · 2.1K citations
A state-of-the-art survey on software merging
Tom Mens · IEEE Transactions on Software Engineering · 2002 · 529 citations
Ernst Lippe, Norbert van Oosterom · 1992 · 169 citations