RCS—a system for version control
Software—Practice & Experience
SDE 5 Proceedings of the fifth ACM SIGSOFT symposium on Software development environments
A framework for shared applications with a replicated architecture
UIST '93 Proceedings of the 6th annual ACM symposium on User interface software and technology
A flexible object merging framework
CSCW '94 Proceedings of the 1994 ACM conference on Computer supported cooperative work
Designing and implementing asynchronous collaborative applications with Bayou
Proceedings of the 10th annual ACM symposium on User interface software and technology
ACM Transactions on Computer-Human Interaction (TOCHI)
Operational transformation in real-time group editors: issues, algorithms, and achievements
CSCW '98 Proceedings of the 1998 ACM conference on Computer supported cooperative work
The IceCube approach to the reconciliation of divergent replicas
Proceedings of the twentieth annual ACM symposium on Principles of distributed computing
The subversion project: buiding a better CVS
Linux Journal
A Log Compression Algorithm for Operation-based Version Control Systems
COMPSAC '02 Proceedings of the 26th International Computer Software and Applications Conference on Prolonging Software Life: Development and Redevelopment
ClearCase MultiSite: Supporting Geographically-Distributed Software Development
Selected papers from the ICSE SCM-4 and SCM-5 Workshops, on Software Configuration Management
Formal design and verification of operational transformation algorithms for copies convergence
Theoretical Computer Science - Algebraic methodology and software technology
A Performance Study of Group Editing Algorithms
ICPADS '06 Proceedings of the 12th International Conference on Parallel and Distributed Systems - Volume 1
A lightweight approach to transparent sharing of familiar single-user editors
CSCW '06 Proceedings of the 2006 20th anniversary conference on Computer supported cooperative work
Data consistency for P2P collaborative editing
CSCW '06 Proceedings of the 2006 20th anniversary conference on Computer supported cooperative work
Customisable collaborative editing supporting the work processes of organisations
Computers in Industry - Special issue: Collaborative environments for concurrent engineering
Generalizing recognition of an individual dialect in program analysis and transformation
Proceedings of the 2007 ACM symposium on Applied computing
Reconciling software configuration management and product data management
Proceedings of the the 6th joint meeting of the European software engineering conference and the ACM SIGSOFT symposium on The foundations of software engineering
An Operational Transformation Algorithm and Performance Evaluation
Computer Supported Cooperative Work
Multi-level Editing of Hierarchical Documents
Computer Supported Cooperative Work
Awareness of Concurrent Changes in Distributed Software Development
OTM '08 Proceedings of the OTM 2008 Confederated International Conferences, CoopIS, DOA, GADA, IS, and ODBASE 2008. Part I on On the Move to Meaningful Internet Systems:
A sequence transformation algorithm for supporting cooperative work on mobile devices
Proceedings of the 2010 ACM conference on Computer supported cooperative work
Flexible collaboration over XML documents
CDVE'06 Proceedings of the Third international conference on Cooperative Design, Visualization, and Engineering
Supporting customised collaboration over shared document repositories
CAiSE'06 Proceedings of the 18th international conference on Advanced Information Systems Engineering
Creative conflict resolution in realtime collaborative editing systems
Proceedings of the ACM 2012 conference on Computer Supported Cooperative Work
Hi-index | 0.00 |
Version control systems are widely used asynchronous collaborative systems in team-working environments, where document merging is a key function. However most existing systems only support limited semantic merging, and techniques for supporting semantic merging are strictly bound up with the merging algorithms that do syntactic merging. In this paper, we propose a flexible merging framework in which semantic merging policies are separated from the syntactic merging mechanism for asynchronous collaborative systems. In this framework, semantic merging policies are not restricted by the merging algorithms used in the syntactic merging mechanism, and the syntactic merging mechanism is flexible to support a wide range of semantic merging policies. This framework can be used to describe and compare a range of existing merging policies and mechanisms, and to guide the design of new merging policies and mechanisms. The proposed framework has been applied to the design of a flexible merging component in FORCE (Flexible Operation-based Revision Control Environment) prototype, which uses a single syntactic merging mechanism to support a range of semantic merging policies.