Merging By Decentralized Eventual Consistency Algorithms
Journal Title: EAI Endorsed Transactions on Collaborative Computing - Year 2015, Vol 1, Issue 6
Abstract
Merging mechanism is an essential operation for version control systems. When each member of collaborative development works on an individual copy of the project, software merging 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. Theusers 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. This paper aims to reduce the conflicts during the collaboration and im prove the productivity. It has three objectives: study the users’ behavior during the collaboration, evaluate the quality of textual merging results produced by specific algorithms and propose a solution to improve the r esult quality produced by the default merge tool of distributed version control systems. Through a study of eight open-source repositories totaling more than 3 million lines of code, we observe the behavior of the concurrent modifications during t he merge p rocedure. We i dentified when th e ex isting 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.
Authors and Affiliations
Ahmed-Nacer Mehdi, Pascal Urso, François Charoy
Keywords
Related Articles
- EP ID EP45705
- DOI http://dx.doi.org/10.4108/eai.21-12-2015.150817
- Views 354
- Downloads 0
Group coordination in a biologically-inspired vectorial network model
Most of the mathematical models of collective behavior describe uncertainty in individual decision making through additive uniform noise. However, recent data driven studies on animal locomotion indicate that a number of...
Modular Asynchronous Web Programming: Advantages & Challenges
Because of the success of the Internet technologies, traditional standalone applications like Spreadsheet and Drawing are now provided as Web Applications. These adopt asynchronous programming that provides high responsi...
A QoE Aware Fairness Bi-level Resource Allocation Algorithm for Multiple Video Streaming in WLAN
With the increasing of smart devices such as mobile phones and tablets, the scenario of multiple video users watching video streaming simultaneously in one wireless local area network (WLAN) becomes more and more popular...
Welcome Message from the Editors-in-Chief
On behalf of the Editorial Board and the Advisory Board, we are pleased to welcome all to the inaugural issue of the EAI Endorsed Transactions on Collaborative Computing. This journal reflects the increasing maturity...
Analysis of Differential Synchronisation’s Energy Consumption on Mobile Devices
Synchronisation algorithms are central to collaborative editing software. As collaboration is increasingly mediated by mobile devices, the energy eÿciency for such algorithms is interest to a wide community of applicatio...