@inproceedings{TUW-196898, author = {Kaufmann, Petra and Kargl, Horst and Langer, Philip and Seidl, Martina and Wieland, Konrad and Wimmer, Manuel and Kappel, Gerti}, title = {Conflicts as First-Class Entities: A UML Profile for Model Versioning}, booktitle = {Models in Software Engineering - Workshops and Symposia at MODELS 2010, Reports and Revised Selected Papers}, year = {2011}, pages = {184--193}, publisher = {Lecture Notes in Computer Science Volume 6627}, address = {Springer}, url = {http://www.springerlink.com/content/a74228763254l671/fulltext.pdf}, isbn = {978-3-642-21209-3}, doi = {10.1007/978-3-642-21210-9} }