Improving conflict resolution in model versioning systems

Petra Broschy
2009 2009 31st International Conference on Software Engineering - Companion Volume  
Collaborative software development is nowadays inconceivable without optimistic version control systems (VCSs). Without such systems the parallel modification of one artifact by multiple users is impracticable. VCSs proved successful in the versioning of code, but they are only conditionally appropriate to the management of model versions. Conflicts which may occur when two different versions of one model are merged are detected in an unsatisfactory manner and consequently, automatic conflict
more » ... solution is hardly offered. In this work, a generic framework allowing precise conflict detection and intelligent conflict resolution for models is proposed.
doi:10.1109/icse-companion.2009.5071020 dblp:conf/icse/Broschy09 fatcat:icmpyjysyrcybax6d3f4gi6jbe