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
Impact of window to walls ratios on thermal comfort and energy consumption in tropical zone
This paper investigated the impact of Window to Wall Ratios (WWR) an the thermal comfort and energy lighting demand of a building in tropical zone. Simulations were carried out for a reference office proposed by Task 27...
Impact on procurement and training by research on the interaction design of medical devices
We present a case study of how research can influence practice in the procurement of healthcare technology based on the CHI+MED project. CHI+MED is concerned with interaction design and the safety of medical devices. It...
Reconciling Schema Matching Networks Through Crowdsourcing
for data integration purposes. Although several automatic schema matching tools have been developed, their results are often incomplete or erroneous. To obtain a correct set of correspondences, usually human effort is re...
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...
A Hybrid Model Ranking Search Result for Research Paper Searching on Social Bookmarking
Social bookmarking and publication sharing systems are essential tools for web resource discovery. The performance and capabilities of search results from research paper bookmarking system are vital. Many researchers use...