Table-Driven Detection and Resolution of Operation-Based Merge Conflicts with Mirador

Decision tables are a useful technique for implementing complex decision logic, and a concise communication device. Model merging is a process that can greatly benefit from the flexibility of control, rapidity of change, and understandability of purpose that tables engender. Heretofore, users have been cut off from the inner workings of merge tools. Among its many features, our model merging tool, Mirador, opens the process of merging to inspection and manipulation. The tool's support for user modification of the decision table rules that drive its conflict detection and resolution, as well as the possibility of adding customized table conditions and actions is the focus of this paper.

[1]  Christoph Treude,et al.  Difference computation of large models , 2007, ESEC-FSE '07.

[2]  Maximilian Koegel,et al.  Operation-based conflict detection and resolution , 2009, 2009 ICSE Workshop on Comparison and Versioning of Software Models.

[3]  Marc Shapiro,et al.  Replication: Optimistic Approaches , 2002 .

[4]  Udo W. Pooch,et al.  Translation of Decision Tables , 1974, ACM Comput. Surv..

[5]  Philip A. Bernstein,et al.  Merging Models Based on Given Correspondences , 2003, VLDB.

[6]  Peter J. H. King.  Conversion of decision tables to computer programs by rule mask techniques , 1966, CACM.

[7]  Antonio Martini,et al.  The Case for Batch Merge of Models – Issues and Challenges , 2010 .

[8]  Tom Mens,et al.  A State-of-the-Art Survey on Software Merging , 2002, IEEE Trans. Software Eng..

[9]  Ernst Lippe,et al.  Operation-based merging , 1992 .

[10]  Arend Rensink.  Model Driven Architecture - Foundations and Applications, 5th European Conference, ECMDA-FA 2009, Enschede, The Netherlands, June 23-26, 2009. Proceedings , 2009, ECMDA-FA.

[11]  Udo Kelter,et al.  History-based merging of models , 2009, 2009 ICSE Workshop on Comparison and Versioning of Software Models.

[12]  Antonio Cicchetti,et al.  Managing Model Conflicts in Distributed Development , 2008, MoDELS.

[13]  Greg Butler,et al.  Mirador: a synthesis of model matching strategies , 2010, IWMCP '10.

[14]  Eleni Stroulia,et al.  UMLDiff: an algorithm for object-oriented design differencing , 2005, ASE.

[15]  Kevin Lano,et al.  Slicing of UML models using model transformations , 2010, MODELS'10.

[16]  Antonio Cicchetti,et al.  A Metamodel Independent Approach to Difference Representation , 2007, J. Object Technol..

[17]  Antony I. T. Rowstron,et al.  The IceCube approach to the reconciliation of divergent replicas , 2001, PODC '01.

[18]  Douglas C. Schmidt,et al.  Guest Editor's Introduction: Model-Driven Engineering , 2006, Computer.

[19]  Bran Selic,et al.  The Pragmatics of Model-Driven Development , 2003, IEEE Softw..

[20]  Benjamin C. Pierce,et al.  What's in Unison? A Formal Specification and Reference Implementation of a File Synchronizer , 2004 .

[21]  Eugene Miya,et al.  On "Software engineering" , 1985, SOEN.

[22]  Robert B. France,et al.  A Generic Approach for Automatic Model Composition , 2008, MoDELS.

[23]  Maik Schmidt,et al.  Constructing difference tools for models using the SiDiff framework , 2008, ICSE Companion '08.

[24]  Dimitrios S. Kolovos,et al.  Establishing Correspondences between Models with the Epsilon Comparison Language , 2009, ECMDA-FA.