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
A Multimodal Dataset for the Analysis of Movement Qualities in Karate Martial Art
A multimodal dataset is presented, which has been collected for analyzing and measuring the quality of movement performed during sport activities. Martial arts (namely karate) are taken as test-beds for investigation. Ka...
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...
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...
SocialCloudShare: a Facebook Application for a Relationship-based Information Sharing in the Cloud
In last few years, Online Social Networks (OSNs) have become one of the most used platforms for sharing data (e.g., pictures, short texts) on the Internet. Nowadays Facebook and Twitter are the most popular OSN providers...
A Collaborative VirtualWorkspace for Factory Configuration and Evaluation
The convergence of information technologies (IT) has enabled the Digital Enterprise in which engineering, production planning, manufacturing and sales processes are supported by IT-based collaboration, simulation and ena...