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.
Type de document :
Communication dans un congrès
9th IEEE International. Conference on Collaborative Computing: Networking, Applications and Worksharing, Oct 2013, Austin, Texas, United States. IEEE, 2013
Liste complète des métadonnées

Littérature citée [42 références]  Voir  Masquer  Télécharger

https://hal.inria.fr/hal-00873506
Contributeur : Mehdi Ahmed-Nacer <>
Soumis le : mardi 15 octobre 2013 - 17:20:01
Dernière modification le : jeudi 11 janvier 2018 - 06:23:13
Document(s) archivé(s) le : vendredi 7 avril 2017 - 11:20:17

Fichier

collborateCom2013.pdf
Fichiers produits par l'(les) auteur(s)

Identifiants

  • HAL Id : hal-00873506, version 1

Collections

Citation

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

Partager

Métriques

Consultations de la notice

435

Téléchargements de fichiers

302