We can work it out: Collaborative Conflict Resolution in Model Versioning.

Petra Brosch, Martina Seidl, Konrad Wieland, Manuel Wimmer

Browse the full ECSCW paper archive.