On merging software extensions
Acta Informatica
SunPro: engineering a practical program development environment
An international workshop on Advanced programming environments
Interprocedural slicing using dependence graphs
PLDI '88 Proceedings of the ACM SIGPLAN 1988 conference on Programming Language design and Implementation
Integrating noninterfering versions of programs
ACM Transactions on Programming Languages and Systems (TOPLAS)
Concurrency control in groupware systems
SIGMOD '89 Proceedings of the 1989 ACM SIGMOD international conference on Management of data
Change oriented versioning in a software engineering database
SCM '89 Proceedings of the 2nd International Workshop on Software configuration management
Detecting interference when merging specification evolutions
IWSSD '89 Proceedings of the 5th international workshop on Software specification and design
Identifying the semantic and textual differences between two versions of a program
PLDI '90 Proceedings of the ACM SIGPLAN 1990 conference on Programming language design and implementation
Heterogeneous configuration management with DSEE
SCM '91 Proceedings of the 3rd international workshop on Software configuration management
Change-oriented version descriptions in EPOS
Software Engineering Journal
The use of program dependence graphs in software engineering
ICSE '92 Proceedings of the 14th international conference on Software engineering
SDE 5 Proceedings of the fifth ACM SIGSOFT symposium on Software development environments
Program restructuring as an aid to software maintenance
Program restructuring as an aid to software maintenance
A framework for shared applications with a replicated architecture
UIST '93 Proceedings of the 6th annual ACM symposium on User interface software and technology
Software merge: semantics of combining changes to programs
ACM Transactions on Programming Languages and Systems (TOPLAS)
Program integration for languages with procedure calls
ACM Transactions on Software Engineering and Methodology (TOSEM)
The CM challenge: configuration management that works
Configuration management
The Adele configuration manager
Configuration management
Flexible conflict detection and management in collaborative applications
Proceedings of the 10th annual ACM symposium on User interface software and technology
Delta algorithms: an empirical analysis
ACM Transactions on Software Engineering and Methodology (TOSEM)
Version models for software configuration management
ACM Computing Surveys (CSUR)
Refactoring: improving the design of existing code
Refactoring: improving the design of existing code
A fast algorithm for computing longest common subsequences
Communications of the ACM
Object-Oriented Software Engineering; Conquering Complex and Changing Systems
Object-Oriented Software Engineering; Conquering Complex and Changing Systems
Computers and Intractability: A Guide to the Theory of NP-Completeness
Computers and Intractability: A Guide to the Theory of NP-Completeness
Semantic Diff: A Tool for Summarizing the Effects of Modifications
ICSM '94 Proceedings of the International Conference on Software Maintenance
Selected papers from the ICSE SCM-4 and SCM-5 Workshops, 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
Palantír: raising awareness among configuration management workspaces
Proceedings of the 25th International Conference on Software Engineering
A Differencing Algorithm for Object-Oriented Programs
Proceedings of the 19th IEEE international conference on Automated software engineering
A three-way merge for XML documents
Proceedings of the 2004 ACM symposium on Document engineering
Using Origin Analysis to Detect Merging and Splitting of Source Code Entities
IEEE Transactions on Software Engineering
A hybrid approach to optimistic file system directory tree synchronization
Proceedings of the 4th ACM international workshop on Data engineering for wireless and mobile access
Towards a taxonomy of software change: Research Articles
Journal of Software Maintenance and Evolution: Research and Practice - Unanticipated Software Evolution
Traceability in viewpoint merging: a model management perspective
TEFSE '05 Proceedings of the 3rd international workshop on Traceability in emerging forms of software engineering
An XML based approach to support the evolution of model-to-model traceability links
TEFSE '05 Proceedings of the 3rd international workshop on Traceability in emerging forms of software engineering
Process model and awareness in SCM
Proceedings of the 12th international workshop on Software configuration management
Revision control system using delta script of syntax tree
Proceedings of the 12th international workshop on Software configuration management
Program element matching for multi-version program analyses
Proceedings of the 2006 international workshop on Mining software repositories
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)
Formal Model Merging Applied to Class Diagram Integration
Electronic Notes in Theoretical Computer Science (ENTCS)
Software systems in-house integration: Architecture, process practices, and strategy selection
Information and Software Technology
Weaving models in conflict detection specifications
Proceedings of the 2007 ACM symposium on Applied computing
Generalizing recognition of an individual dialect in program analysis and transformation
Proceedings of the 2007 ACM symposium on Applied computing
Modeling Product Line Architectures through Change Sets and Relationships
ICSE '07 Proceedings of the 29th international conference on Software Engineering
Automatic Inference of Structural Changes for Matching across Program Versions
ICSE '07 Proceedings of the 29th international conference on Software Engineering
Refactoring-Aware Configuration Management for Object-Oriented Programs
ICSE '07 Proceedings of the 29th international conference on Software Engineering
Collaboration in Software Engineering: A Roadmap
FOSE '07 2007 Future of Software Engineering
JDiff: A differencing technique and tool for object-oriented programs
Automated Software Engineering
Mining Workspace Updates in CVS
MSR '07 Proceedings of the Fourth International Workshop on Mining Software Repositories
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
Change Distilling: Tree Differencing for Fine-Grained Source Code Change Extraction
IEEE Transactions on Software Engineering
Merging distributed database summaries
Proceedings of the sixteenth ACM conference on Conference on information and knowledge management
Improving change prediction with fine-grained source code mining
Proceedings of the twenty-second IEEE/ACM international conference on Automated software engineering
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
Collaborative software engineering on large-scale models: requirements and experience in ModelBus
Proceedings of the 2008 ACM symposium on Applied computing
Consistence preserving model merge in collaborative development processes
Proceedings of the 2008 international workshop on Comparison and versioning of software models
Using model comparison to maintain model-to-standard compliance
Proceedings of the 2008 international workshop on Comparison and versioning of software models
Merging Hierarchically-Structured Documents in Workflow Systems
Electronic Notes in Theoretical Computer Science (ENTCS)
Models in Conflict --- Towards a Semantically Enhanced Version Control System for Models
Models in Software Engineering
Managing Model Conflicts in Distributed Development
MoDELS '08 Proceedings of the 11th international conference on Model Driven Engineering Languages and Systems
Empirical evidence of the benefits of workspace awareness in software configuration management
Proceedings of the 16th ACM SIGSOFT International Symposium on Foundations of software engineering
Versioning XML-based office documents
Multimedia Tools and Applications
FEATUREHOUSE: Language-independent, automated software composition
ICSE '09 Proceedings of the 31st International Conference on Software Engineering
Safe-commit analysis to facilitate team software development
ICSE '09 Proceedings of the 31st International Conference on Software Engineering
Different models for model matching: An analysis of approaches to support model differencing
CVSM '09 Proceedings of the 2009 ICSE Workshop on Comparison and Versioning of Software Models
History-based merging of models
CVSM '09 Proceedings of the 2009 ICSE Workshop on Comparison and Versioning of Software Models
Comparison and versioning of scientific workflows
CVSM '09 Proceedings of the 2009 ICSE Workshop on Comparison and Versioning of Software Models
CVSM '09 Proceedings of the 2009 ICSE Workshop on Comparison and Versioning of Software Models
D-Praxis: A Peer-to-Peer Collaborative Model Editing Framework
DAIS '09 Proceedings of the 9th IFIP WG 6.1 International Conference on Distributed Applications and Interoperable Systems
Dependent and Conflicting Change Operations of Process Models
ECMDA-FA '09 Proceedings of the 5th European Conference on Model Driven Architecture - Foundations and Applications
Proceedings of the 9th ACM symposium on Document engineering
Refactoring-aware versioning in Eclipse
Electronic Notes in Theoretical Computer Science (ENTCS)
Traceability-based incremental model synchronization
WSEAS Transactions on Computers
Refactoring merging environment supported by graph transformations
SE '08 Proceedings of the IASTED International Conference on Software Engineering
Syxaw: Data Synchronization Middleware for the Mobile Web
Mobile Networks and Applications
Modeling PLA variation of privacy-enhancing personalized systems
Proceedings of the 13th International Software Product Line Conference
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
Focused identification of process model changes
ICSP'07 Proceedings of the 2007 international conference on Software process
Context dependency management in ontology engineering: a formal approach
Journal on data semantics VIII
A formal investigation of Diff3
FSTTCS'07 Proceedings of the 27th international conference on Foundations of software technology and theoretical computer science
The secret life of a process description: a look into the evolution of a large process model
ICSP'08 Proceedings of the Software process, 2008 international conference on Making globally distributed software development a success story
Structuring the modeling space and supporting evolution in software product line engineering
Journal of Systems and Software
Syde: a tool for collaborative software development
Proceedings of the 32nd ACM/IEEE International Conference on Software Engineering - Volume 2
EMFStore: a model repository for EMF models
Proceedings of the 32nd ACM/IEEE International Conference on Software Engineering - Volume 2
Enhancing collaboration of multi-developer projects with synchronous changes
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
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
Using versioned tree data structure, change detection and node identity for three-way XML merging
Proceedings of the 10th ACM symposium on Document engineering
APCCM '09 Proceedings of the Sixth Asia-Pacific Conference on Conceptual Modeling - Volume 96
A recommender for conflict resolution support in optimistic model versioning
Proceedings of the ACM international conference companion on Object oriented programming systems languages and applications companion
From state- to delta-based bidirectional model transformations
ICMT'10 Proceedings of the Third international conference on Theory and practice of model transformations
Concurrent modeling in early phases of the software development life cycle
CRIWG'10 Proceedings of the 16th international conference on Collaboration and technology
Dissecting configuration management policies
SCM'01/SCM'03 Proceedings of the 2001 ICSE Workshops on SCM 2001, and SCM 2003 conference on Software configuration management
Managing the evolution of distributed and interrelated components
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
Model evolution and management
MBEERTS'07 Proceedings of the 2007 International Dagstuhl conference on Model-based engineering of embedded real-time systems
Conflict detection for model versioning based on graph modifications
ICGT'10 Proceedings of the 5th international conference on Graph transformations
Precise detection of conflicting change operations using process model terms
MODELS'10 Proceedings of the 13th international conference on Model driven engineering languages and systems: Part II
Capturing the intention of model changes
MODELS'10 Proceedings of the 13th international conference on Model driven engineering languages and systems: Part II
Model synchronization: mappings, tiles, and categories
GTTSE'09 Proceedings of the 3rd international summer school conference on Generative and transformational techniques in software engineering III
An implementation for merging images for version control
ICCOMP'06 Proceedings of the 10th WSEAS international conference on Computers
Branching and merging: an investigation into current version control practices
Proceedings of the 4th International Workshop on Cooperative and Human Aspects of Software Engineering
Engineering multi-tenant software-as-a-service systems
Proceedings of the 3rd International Workshop on Principles of Engineering Service-Oriented Systems
Proceedings of the 2011 International Conference on Software and Systems Process
Conflicts as first-class entities: a UML profile for model versioning
MODELS'10 Proceedings of the 2010 international conference on Models in software engineering
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
Challenges in model-based evolution and merging of access control policies
Proceedings of the 12th International Workshop on Principles of Software Evolution and the 7th annual ERCIM Workshop on Software Evolution
Proactive detection of collaboration conflicts
Proceedings of the 19th ACM SIGSOFT symposium and the 13th European conference on Foundations of software engineering
Semistructured merge: rethinking merge in revision control systems
Proceedings of the 19th ACM SIGSOFT symposium and the 13th European conference on Foundations of software engineering
CDDiff: semantic differencing for class diagrams
Proceedings of the 25th European conference on Object-oriented programming
Backstage Java: making a difference in metaprogramming
Proceedings of the 2011 ACM international conference on Object oriented programming systems languages and applications
Towards modular code generators using symmetric language-aware aspects
Proceedings of the 1st International Workshop on Free Composition
Rewriting history: more power to creative people
Proceedings of the 23rd Australian Computer-Human Interaction Conference
Proceedings of the ACM 2012 conference on Computer Supported Cooperative Work
Novel user interfaces for diagram versioning and differencing
BCS '10 Proceedings of the 24th BCS Interaction Specialist Group Conference
A graphical specification of model transformations with triple graph grammars
ECMDA-FA'05 Proceedings of the First European conference on Model Driven Architecture: foundations and Applications
Dynamic computation of change operations in version management of business process models
ECMFA'10 Proceedings of the 6th European conference on Modelling Foundations and Applications
Process model difference analysis for supporting process evolution
EuroSPI'06 Proceedings of the 13th European conference on Software Process Improvement
Model patches in model-driven engineering
MODELS'09 Proceedings of the 2009 international conference on Models in Software Engineering
ASE '11 Proceedings of the 2011 26th IEEE/ACM International Conference on Automated Software Engineering
XCC: change control of XML documents
Computer Science - Research and Development
Model-Driven techniques to enhance architectural languages interoperability
FASE'12 Proceedings of the 15th international conference on Fundamental Approaches to Software Engineering
Cohesive and isolated development with branches
FASE'12 Proceedings of the 15th international conference on Fundamental Approaches to Software Engineering
Change-driven model transformations
Software and Systems Modeling (SoSyM)
Proceedings of the 17th International Conference on 3D Web Technology
3D diff: an interactive approach to mesh differencing and conflict resolution
ACM SIGGRAPH 2012 Talks
Structured merge with auto-tuning: balancing precision and performance
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
Connecting the rationale for changes to the evolution of a process
PROFES'07 Proceedings of the 8th international conference on Product-Focused Software Process Improvement
Maintaining a large process model aligned with a process standard: an industrial example
EuroSPI'07 Proceedings of the 14th European conference on Software Process Improvement
Bottom-up meta-modelling: an interactive approach
MODELS'12 Proceedings of the 15th international conference on Model Driven Engineering Languages and Systems
Evaluating the effort of composing design models: a controlled experiment
MODELS'12 Proceedings of the 15th international conference on Model Driven Engineering Languages and Systems
3D Diff: an interactive approach to mesh differencing and conflict resolution
SIGGRAPH Asia 2012 Technical Briefs
A posteriori operation detection in evolving software models
Journal of Systems and Software
Optimising schema evolution operation sequences in object databases for data evolution
ER'12 Proceedings of the 31st international conference on Conceptual Modeling
Business Process Model Merging: An Approach to Business Process Consolidation
ACM Transactions on Software Engineering and Methodology (TOSEM)
Turning Conflicts into Collaboration
Computer Supported Cooperative Work
Proceedings of the 15th annual conference on Genetic and evolutionary computation
Cassandra: proactive conflict minimization through optimized task scheduling
Proceedings of the 2013 International Conference on Software Engineering
Detection and resolution of conflicting change operations in version management of process models
Software and Systems Modeling (SoSyM)
Towards migration-aware filtering in model differences application
Proceedings of the 6th International Workshop on Models and Evolution
Software and Systems Modeling (SoSyM)
| Hi-index | 0.00 |
Software merging is an essential aspect of the maintenance and evolution of large-scale software systems. This paper provides a comprehensive survey and analysis of available merge approaches. Over the years, a wide variety of different merge techniques has been proposed. While initial techniques were purely based on textual merging, more powerful approaches also take the syntax and semantics of the software into account. There is a tendency towards operation-based merging because of its increased expressiveness. Another tendency is to try to define merge techniques that are as general, accurate, scalable, and customizable as possible, so that they can be used in any phase in the software life-cycle and detect as many conflicts as possible. After comparing the possible merge techniques, we suggest a number of important open problems and future research directions.