A recommender for conflict resolution support in optimistic model versioning
Petra Brosch, Martina Seidl, Gerti Kappel · 2010
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".