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 345
- Downloads 0
Reinforcement Learning with Internal Reward for Multi-Agent Cooperation: A Theoretical Approach
This paper focuses on a multi-agent cooperation which is generally difficult to be achieved without sufficient information of other agents, and proposes the reinforcement learning method that introduces an internal rewar...
Message from the Editors-in-Chief
We are very pleased to welcome you all to the second issue of this journal. In this issue, we present six selected invited papers that span various aspects of collaborative computing and technologies. In particular, t...
A Novel Stackelberg-Bertrand Game Model for Pricing Content Provider
With the popularity of smart devices such as smartphone, tablet, contents that traditionally be viewed on a personal computer, can also be viewed on these smart devices. The demand for contents thus is increasing year by...
A Novel, Privacy Preserving, Architecture for Online Social Networks
The centralized nature of conventional OSNs poses serious risks to the privacy and security of information exchanged between their members. These risks prompted several attempts to create decentralized OSNs, or DOSNs. Th...
Testing Software Using Swarm Intelligence: A Bee Colony Optimization Approach
Software testing is a critical activity in increasing our confidence of a system under test and improving its quality. The key idea for testing a software application is to minimize the number of faults found in the syst...