@phdthesis{TUW-209022, author = {Wieland, Konrad}, title = {Conflict-tolerant Model Versioning}, school = {E188 Institut f{\"u}r Softwaretechnik und Interaktive Systeme}, year = {2011}, url = {http://publik.tuwien.ac.at/files/PubDat_209022.pdf}, keywords = {Modell-getriebene Softwareentwicklung, Model-driven software engineering, MDSE, Versionierung, Konflikte, conflicts, version control, versioning} }