Proceedings of the 2006 international workshop on Global integrated model management
Consistence preserving model merge in collaborative development processes
Proceedings of the 2008 international workshop on Comparison and versioning of software models
Towards a Categorical Matching Method to Process High-Dimensional Emergency Knowledge Structures
ISNN '08 Proceedings of the 5th international symposium on Neural Networks: Advances in Neural Networks, Part II
A General Approach for Scenario Integration
MoDELS '08 Proceedings of the 11th international conference on Model Driven Engineering Languages and Systems
A Category-Theoretical Approach to the Formalisation of Version Control in MDE
FASE '09 Proceedings of the 12th International Conference on Fundamental Approaches to Software Engineering: Held as Part of the Joint European Conferences on Theory and Practice of Software, ETAPS 2009
Pushout: a mathematical model of architectural merger
PSI'06 Proceedings of the 6th international Andrei Ershov memorial conference on Perspectives of systems informatics
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
| Hi-index | 0.00 |
Software merging is a common and essential activity during the lifespan of large-scale software systems. Traditional textual merge techniques are inadequate for detecting syntactic merge conflicts. In this paper, we propose a domain-independent approach for syntactic software merging that exploits the graph-based structure(s) of programs. We use morphisms between fuzzy graphs to capture the relationships between the structural elements of the programs to be merged, and apply a truth ordering lattice to express inconsistencies and evolutionary properties as we compute the merge. We demonstrate the approach with a three-way consolidation merge in a commercial software system; in particular, we show how analyzing merged call structures can help developers gain a better understanding and control of software evolution.