RCS—a system for version control
Software—Practice & Experience
SunPro: engineering a practical program development environment
An international workshop on Advanced programming environments
Integrating noninterfering versions of programs
ACM Transactions on Programming Languages and Systems (TOPLAS)
Integrating non-intering versions of programs
POPL '88 Proceedings of the 15th ACM SIGPLAN-SIGACT symposium on Principles of programming languages
Introduction to algorithms
Structure-oriented merging of revisions of software documents
SCM '91 Proceedings of the 3rd international workshop on Software configuration management
Computer-Aided Software Engineering in a distributed workstation environment
SDE 1 Proceedings of the first ACM SIGSOFT/SIGPLAN software engineering symposium on Practical software development environments
Fine-grained revision control for collaborative software development
SIGSOFT '93 Proceedings of the 1st ACM SIGSOFT symposium on Foundations of software engineering
Direct update of data flow representations for a meaning-preserving program restructuring tool
SIGSOFT '93 Proceedings of the 1st ACM SIGSOFT symposium on Foundations of software engineering
Architectural Tradeoffs for a Meaning-Preserving Program Restructuring Tool
IEEE Transactions on Software Engineering - Special issue on software architecture
Version models for software configuration management
ACM Computing Surveys (CSUR)
An algebraic approach to file synchronization
Proceedings of the 8th European software engineering conference held jointly with 9th ACM SIGSOFT international symposium on Foundations of software engineering
A State-of-the-Art Survey on Software Merging
IEEE Transactions on Software Engineering
Flexible Merging for Asynchronous Collaborative Systems
On the Move to Meaningful Internet Systems, 2002 - DOA/CoopIS/ODBASE 2002 Confederated International Conferences DOA, CoopIS and ODBASE 2002
A Complete Textual Merging Algorithm for Software Configuration Management Systems
COMPSAC '04 Proceedings of the 28th Annual International Computer Software and Applications Conference - Volume 01
Refactoring-aware version control
Proceedings of the 28th international conference on Software engineering
Program element matching for multi-version program analyses
Proceedings of the 2006 international workshop on Mining software repositories
Post-partition reconciliation protocols for maintaining consistency
Proceedings of the 2006 ACM symposium on Applied computing
Automated upgrading of component-based applications
Companion to the 21st ACM SIGPLAN symposium on Object-oriented programming systems, languages, and applications
MolhadoRef: a refactoring-aware software configuration management tool
Companion to the 21st ACM SIGPLAN symposium on Object-oriented programming systems, languages, and applications
MolhadoRef: a refactoring-aware infrastructure for OO programs
eclipse '06 Proceedings of the 2006 OOPSLA workshop on eclipse technology eXchange
A Change-based Approach to Software Evolution
Electronic Notes in Theoretical Computer Science (ENTCS)
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
Refactoring-Aware Configuration Management for Object-Oriented Programs
ICSE '07 Proceedings of the 29th international conference on Software Engineering
Mining a Change-Based Software Repository
MSR '07 Proceedings of the Fourth International Workshop on Mining Software Repositories
Encapsulating and exploiting change with changeboxes
ICDL '07 Proceedings of the 2007 international conference on Dynamic languages: in conjunction with the 15th International Smalltalk Joint Conference 2007
Detecting model inconsistency through operation-based model construction
Proceedings of the 30th international conference on Software engineering
Towards software configuration management for unified models
Proceedings of the 2008 international workshop on Comparison and versioning of software models
Peer-to-peer collaboration over XML documents
CDVE '08 Proceedings of the 5th international conference on Cooperative Design, Visualization, and Engineering
Example-Based Program Transformation
MoDELS '08 Proceedings of the 11th international conference on Model Driven Engineering Languages and Systems
Multi-level Editing of Hierarchical Documents
Computer Supported Cooperative Work
History-based merging of models
CVSM '09 Proceedings of the 2009 ICSE Workshop on Comparison and Versioning of Software Models
Operation-based conflict detection and resolution
CVSM '09 Proceedings of the 2009 ICSE Workshop on Comparison and Versioning of Software Models
Refactoring-aware versioning in Eclipse
Electronic Notes in Theoretical Computer Science (ENTCS)
An approach to software evolution based on semantic change
FASE'07 Proceedings of the 10th international conference on Fundamental approaches to software engineering
Distributed hash table based peer-to-peer version control system for collaboration
CSCWD'06 Proceedings of the 10th international conference on Computer supported cooperative work in design III
Software configuration management for test-driven development
XP'03 Proceedings of the 4th international conference on Extreme programming and agile processes in software engineering
EMFStore: a model repository for EMF models
Proceedings of the 32nd ACM/IEEE International Conference on Software Engineering - Volume 2
Mirador: a synthesis of model matching strategies
Proceedings of the 1st International Workshop on Model Comparison in Practice
Operation-based conflict detection
Proceedings of the 1st International Workshop on Model Comparison in Practice
A formal approach to three-way merging of EMF models
Proceedings of the 1st International Workshop on Model Comparison in Practice
Colex: a web-based collaborative conflict lexicon
Proceedings of the 1st International Workshop on Model Comparison in Practice
Towards a generic operation recorder for model evolution
Proceedings of the 1st International Workshop on Model Comparison in Practice
Merging collection data structures in a content management system
SCM'01/SCM'03 Proceedings of the 2001 ICSE Workshops on SCM 2001, and SCM 2003 conference on Software configuration management
Towards software configuration management for test-driven development
SCM'01/SCM'03 Proceedings of the 2001 ICSE Workshops on SCM 2001, and SCM 2003 conference on Software configuration management
Table-driven detection and resolution of operation-based merge conflicts with mirador
ECMFA'11 Proceedings of the 7th European conference on Modelling foundations and applications
Backstage Java: making a difference in metaprogramming
Proceedings of the 2011 ACM international conference on Object oriented programming systems languages and applications
Fragment-based version management for repositories of business process models
OTM'11 Proceedings of the 2011th Confederated international conference on On the move to meaningful internet systems - Volume Part I
Operation-based, fine-grained version control model for tree-based representation
FASE'10 Proceedings of the 13th international conference on Fundamental Approaches to Software Engineering
Supporting customised collaboration over shared document repositories
CAiSE'06 Proceedings of the 18th international conference on Advanced Information Systems Engineering
Formalising reconciliation in partitionable networks with distributed services
Rigorous Development of Complex Fault-Tolerant Systems
Journal of Computer and System Sciences
ASE '11 Proceedings of the 2011 26th IEEE/ACM International Conference on Automated Software Engineering
Making software integration really continuous
FASE'12 Proceedings of the 15th international conference on Fundamental Approaches to Software Engineering
Refining code ownership with synchronous changes
Empirical Software Engineering
Structured merge with auto-tuning: balancing precision and performance
Proceedings of the 27th IEEE/ACM International Conference on Automated Software Engineering
Adaptability of model comparison tools
Proceedings of the 27th IEEE/ACM International Conference on Automated Software Engineering
An introduction to model versioning
SFM'12 Proceedings of the 12th international conference on Formal Methods for the Design of Computer, Communication, and Software Systems: formal methods for model-driven engineering
Authenticating operation-based history in collaborative systems
Proceedings of the 17th ACM international conference on Supporting group work
A posteriori operation detection in evolving software models
Journal of Systems and Software
Turning Conflicts into Collaboration
Computer Supported Cooperative Work
Proceedings of the 15th annual conference on Genetic and evolutionary computation
Detection and resolution of conflicting change operations in version management of process models
Software and Systems Modeling (SoSyM)
Software and Systems Modeling (SoSyM)
| Hi-index | 0.00 |
Existing approaches for merging the results of parallel development activities are limited. These approaches can be characterised as state-based: only the initial and final states are considered. This paper introduces operation-based merging, which uses the operations that were performed during development. In many cases operation-based merging has advantages over state-based merging, because it automatically respects the data-type invariants of the objects, is extensible for arbitrary object types, provides better conflict detection and allows for better support for solving these conflicts. Several algorithms for conflict detection are described and compared.