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 322
- Downloads 0
Automated Dimension Determination for NMF-based Incremental Collaborative Filtering
The nonnegative matrix factorization (NMF) based collaborative filtering t e chniques h a ve a c hieved great success in product recommendations. It is well known that in NMF, the dimensions of the factor matrices have t...
Guest Editorial: Selected Papers from IEEE IEEE/EAI CollaborateCom 2013
This issue of EAI Transactions on Collaborative Computing includes extended versions of articles selected from the program of the 9th IEEE International Conference on Collaborative Computing: Networking, Applications...
Cooperative sensors: a new wired body-sensor-network approach for wearable biopotential measurement
Cooperative sensors are a novel measurement architecture based on active dry electrodes that allows the acquisition of biopotential signals (e.g., electrocardiogram, ECG) on patients in a comfortable and easy-to-integrat...
Space Searching Algorithms Used by Fungi
Experimental studies have shown that fungi use a natural program for searching the space available in micro-confined networks, e.g., mazes. This natural program, which comprises two subroutines, i.e., collision-induced b...
Evolving and Controlling Perimeter, Rendezvous, and Foraging Behaviors in a Computation-Free Robot Swarm
Designing and controlling the collective behavior of a swarm often requires complex range, bearing sensors, and peer-to-peer communication strategies. Recent work studying swarm of robots that have no computational power...