Collaborative code conflict detection, notification and resolution

摘要

A computer code conflict notification and resolution technique that provides a collaborative programming environment for conflicts management is presented. The technique detects potential conflicts and provides facilities that allow programmers to work collaboratively to resolve the conflicts as they occur. This includes the ability to conduct a code session in which conflicting code elements are compared and changed as needed to resolve conflicts. In addition, in-place audio/video, text chat and application sharing is provided. This allows communication sessions to be conducted within the programming environment.