Real-time collaborative resolving of merge conflicts

  title={Real-time collaborative resolving of merge conflicts},
  author={Antti Nieminen},
  journal={8th International Conference on Collaborative Computing: Networking, Applications and Worksharing (CollaborateCom)},
  • Antti Nieminen
  • Published 2012 in
    8th International Conference on Collaborative…
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 lacking from the current conflict-resolving tools is the utilization of collective knowledge of project members, achievable through web-based collaboration. The person encountering the conflict may not… CONTINUE READING