A recommender for conflict resolution support in optimistic model versioning

The usage of optimistic version control systems comes along with cumbersome and time-consuming conflict resolution in the case that the modifications of two developers are contradicting. For code as well as for any other artifact the resolution support moves hardly beyond the choices "keep mine", "keep theirs", "take all changes", or "abandon all changes". To ease the conflict resolution in the context of model versioning, we propose a recommender system which suggests automatically executable resolution patterns to the developer responsible for the conflict resolution. The lookup algorithm is based on a similarity-aware graph matching approach incorporating information from the metamodel of the used modeling language. This allows not only the retrieval of recommendations exactly matching the given conflict situation, but also the identification of similar conflict situations whose resolution patterns are adaptable to the current conflict. Categ...

• Type: Journal
• Year: 2010
• Where: OOPSLA
• Authors: Petra Brosch, Martina Seidl, Gerti Kappel
• Keywords: Conflict Resolution, OOPSLA 2010, Resolution Patterns, Security Privacy, Time-consuming Conflict Resolution