Improving Textual Merge Result - Inria - Institut national de recherche en sciences et technologies du numérique Access content directly
Conference Papers Year : 2013

Improving Textual Merge Result

Mehdi Ahmed-Nacer
  • Function : Author
  • PersonId : 999987
  • IdRef : 185654932
Pascal Urso
  • Function : Author
  • PersonId : 864747
François Charoy

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.
Fichier principal
Vignette du fichier
collborateCom2013.pdf (2.73 Mo) Télécharger le fichier
Origin : Files produced by the author(s)
Loading...

Dates and versions

hal-00873506 , version 1 (15-10-2013)

Identifiers

  • HAL Id : hal-00873506 , version 1

Cite

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⟩
248 View
403 Download

Share

Gmail Facebook X LinkedIn More