@phdthesis{TUW-208975, author = {Kaufmann, Petra}, title = {Conflict Resolution in Model Versioning}, school = {E188 Institut f{\"u}r Softwaretechnik und Interaktive Systeme}, year = {2012}, url = {http://publik.tuwien.ac.at/files/PubDat_208975.pdf}, keywords = {model versioning, conflict resolution, merging} }