@inproceedings{TUW-178479, author = {Wieland, Konrad}, title = {Advanced Conflict Resolution Support for Model Versioning Systems}, booktitle = {Proceedings of the Doctoral Symposium at MODELS 2009}, year = {2009}, publisher = {School of Computing, Queen's University}, numpages = {6}, eid = {4}, url = {http://research.cs.queensu.ca/TechReports/Reports/2009-566.pdf}, keywords = {model versioning, conflict resolution, model merging} }