We can work it out: Collaborative Conflict Resolution in Model Versioning
| dc.contributor.author | Brosch, Petra | |
| dc.contributor.author | Seidl, Martina | |
| dc.contributor.author | Wieland, Konrad | |
| dc.contributor.author | Wimmer, Manuel | |
| dc.date.accessioned | 2017-04-15T11:44:33Z | |
| dc.date.available | 2017-04-15T11:44:33Z | |
| dc.date.issued | 2009 | |
| dc.description.abstract | For the versioning of code a pantheon of version control system (VCS) solutions has been realized and is successfully applied in practice. Nevertheless, when it comes to merging two different versions of one artifact, the resolution of conflicts poses a major challenge. In standard systems, the developer who performs the later commit is sole in charge of this often time-consuming, error-prone task. This commit carries the inherent danger of losing the modifications of the other developer. Recently, collaborative merge approaches for code versioning systems have been proposed to minimize this risk. In this paper we propose to apply similar techniques in the context of model versioning where the challenge of merging two versions is even more formidable due to their graph-structure and their rich semantics. In particular, modeling is used in the early phases of the software development, where a | |
| dc.identifier.doi | 10.1007/978-1-84882-854-4_12 | |
| dc.identifier.isbn | 978-1-84882-854-4 | |
| dc.language.iso | en | |
| dc.publisher | Springer, London | |
| dc.relation.ispartof | ECSCW 2009: Proceedings of the 11th European Conference on Computer Supported Cooperative Work | |
| dc.relation.ispartofseries | ECSCW | |
| dc.title | We can work it out: Collaborative Conflict Resolution in Model Versioning | |
| dc.type | Text | |
| gi.citation.endPage | 214 | |
| gi.citation.startPage | 207 | |
| gi.citations.count | 15 | |
| gi.citations.element | Javier Luis Canovas Izquierdo, Jordi Cabot (2012): Community-driven language development, In: 2012 4th International Workshop on Modeling in Software Engineering (MISE), doi:10.1109/mise.2012.6226011 | |
| gi.citations.element | Ta’id Holmes, Uwe Zdun, Florian Daniel, Schahram Dustdar (2010): Monitoring and Analyzing Service-Based Internet Systems through a Model-Aware Service Environment, In: Notes on Numerical Fluid Mechanics and Multidisciplinary Design, doi:10.1007/978-3-642-13094-6_9 | |
| gi.citations.element | Jae Young Bang, Yuriy Brun, Nenad Medvidovic (2017): Continuous Analysis of Collaborative Design, In: 2017 IEEE International Conference on Software Architecture (ICSA), doi:10.1109/icsa.2017.45 | |
| gi.citations.element | Taid Holmes, Uwe Zdun, Schahram Dustdar (2012): Automating the Management and Versioning of Service Models at Runtime to Support Service Monitoring, In: 2012 IEEE 16th International Enterprise Distributed Object Computing Conference, doi:10.1109/edoc.2012.32 | |
| gi.citations.element | Manouchehr Zadahmad, Eugene Syriani, Omar Alam, Esther Guerra, Juan de Lara (2022): DSMCompare: domain-specific model differencing for graphical domain-specific languages, In: Software and Systems Modeling 5(21), doi:10.1007/s10270-021-00971-1 | |
| gi.citations.element | Luigi Quaranta, Fabio Calefato, Filippo Lanubile (2022): Eliciting Best Practices for Collaboration with Computational Notebooks, In: Proceedings of the ACM on Human-Computer Interaction CSCW1(6), doi:10.1145/3512934 | |
| gi.citations.element | Michael Prilla, Alexander Nolte, Thomas Herrmann, Gwendolyn Kolfschoten, Stephan Lukosch (2013): Collaborative Usage and Development of Models, In: International Journal of e-Collaboration 4(9), doi:10.4018/ijec.2013100101 | |
| gi.citations.element | Javier Luis Cánovas Izquierdo, Jordi Cabot (2013): Enabling the Collaborative Definition of DSMLs, In: Notes on Numerical Fluid Mechanics and Multidisciplinary Design, doi:10.1007/978-3-642-38709-8_18 | |
| gi.citations.element | McLyndon S. de L. Xavier, Kleinner Farias, Jorge Barbosa, Lucian Gonçales, Vinicius Bishoff (2019): UMLCollab, In: Proceedings of the XV Brazilian Symposium on Information Systems, doi:10.1145/3330204.3330239 | |
| gi.citations.element | Konrad Wieland, Geraldine Fitzpatrick, Gerti Kappel, Martina Seidl, Manuel Wimmer (2011): Towards an Understanding of Requirements for Model Versioning Support, In: International Journal of People-Oriented Programming 2(1), doi:10.4018/ijpop.2011070101 | |
| gi.citations.element | Ta’id Holmes, Emmanuel Mulo, Uwe Zdun, Schahram Dustdar (2011): Model-aware Monitoring of SOAs for Compliance, In: Service Engineering, doi:10.1007/978-3-7091-0415-6_5 | |
| gi.citations.element | Francis Bordeleau, Benoit Combemale, Romina Eramo, Mark van den Brand, Manuel Wimmer (2020): Towards Model-Driven Digital Twin Engineering: Current Opportunities and Future Challenges, In: Communications in Computer and Information Science, doi:10.1007/978-3-030-58167-1_4 | |
| gi.citations.element | Csaba Debreceni, István Ráth, Dániel Varró, Xabier De Carlos, Xabier Mendialdua, Salvador Trujillo (2016): Automated Model Merge by Design Space Exploration, In: Lecture Notes in Computer Science, doi:10.1007/978-3-662-49665-7_7 | |
| gi.citations.element | Mirco Franzago, Davide Di Ruscio, Ivano Malavolta, Henry Muccini (2018): Collaborative Model-Driven Software Engineering: A Classification Framework and a Research Map, In: IEEE Transactions on Software Engineering 12(44), doi:10.1109/tse.2017.2755039 | |
| gi.citations.element | Yiqi Wu, Fazhi He, Soonhung Han (2017): Collaborative CAD Synchronization Based on a Symmetric and Consistent Modeling Procedure, In: Symmetry 4(9), doi:10.3390/sym9040059 | |
| gi.conference.date | 07-11 September 2009 | |
| gi.conference.location | Vienna Austria | |
| gi.conference.sessiontitle | Full Papers |