Real-time Collaborative Resolving of Merge Conflicts
Antti Nieminen · 2012
Merge conflicts are common especially in large and distributed software projects. There have been development to both make the conflicts less frequent by introducing better merge algorithms and to aid the user in resolving conflicts by better visualization and other means. However, one element lack