Skip to Main content Skip to Navigation
New interface
Conference papers

Improving Textual Merge Result

Mehdi Ahmed-Nacer 1 Pascal Urso 1 François Charoy 1 
1 SCORE - Services and Cooperation
Inria Nancy - Grand Est, LORIA - NSS - Department of Networks, Systems and Services
Abstract : In asynchronous collaborative systems, merging is an essential component. It allows to reconcile modifications made concurrently as well as managing software change through branching. The collaborative system is in charge to propose a merge result that includes user's modifications. The users now have to check and adapt this result. The adaptation should be as effort-less as possible, otherwise, the users may get frustrated and will quit the collaboration. The objective of this paper is to improve the result quality of the textual merge tool that constitutes the default merge tool of distributed version control systems. The basic idea is to study the behavior of the concurrent modifications during merge procedure. We identified when the existing merge techniques under-perform, and we propose solutions to improve the quality of the merge. We finally compare with the traditional merge tool through a large corpus of collaborative editing.
Document type :
Conference papers
Complete list of metadata

Cited literature [42 references]  Display  Hide  Download
Contributor : Mehdi Ahmed-Nacer Connect in order to contact the contributor
Submitted on : Tuesday, October 15, 2013 - 5:20:01 PM
Last modification on : Saturday, June 25, 2022 - 7:39:53 PM
Long-term archiving on: : Friday, April 7, 2017 - 11:20:17 AM


Files produced by the author(s)


  • HAL Id : hal-00873506, version 1



Mehdi Ahmed-Nacer, Pascal Urso, François Charoy. Improving Textual Merge Result. CollaborateCom 2013 - 9th IEEE International Conference on Collaborative Computing: Networking, Applications and Worksharing, Oct 2013, Austin, Texas, United States. ⟨hal-00873506⟩



Record views


Files downloads