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
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)
Version models for software configuration management
ACM Computing Surveys (CSUR)
Concurrent software development
Communications of the ACM
The IceCube approach to the reconciliation of divergent replicas
Proceedings of the twentieth annual ACM symposium on Principles of distributed computing
Open Source Development with CVS
Open Source Development with CVS
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
Refactoring-Aware Configuration Management for Object-Oriented Programs
ICSE '07 Proceedings of the 29th international conference on Software Engineering
| Hi-index | 0.00 |
Software configuration management (SCM) systems are very important for coordinating group efforts in developing large and complex software systems. The ability to support concurrent software development is the key to deliver high quality software with low time-to-market, where merging is the core enabling technique. Textual merging is the primary and the only successful merging function available in todayýs SCM systems. However, none of them supports complete textual merging, which is not only very useful itself but also the foundation for syntactic and semantic textual merging. In this paper, we propose a novel operation-based textual merging algorithm, which has the capability of supporting complete textual merging while still preserving the intentions of individual editing operations.