Collaborative code conflict detection, notification and resolution

• US 8,407,670 B2
• Filed: 06/02/2006
• Issued: 03/26/2013
• Est. Priority Date: 06/02/2006
• Status: Active Grant

• Current Assignee: Microsoft Technology Licensing LLC (Microsoft Corporation)
• Original Assignee: Microsoft Corporation
• Inventors: Hegde, Rajesh, Dewan, Prasun
• Primary Examiner(s): Zhen, Wei
• Assistant Examiner(s): UNG, LANNY N
• Application Number:
  US11/421,917
• Publication Number:
  US 20070283321A1
• Time in Patent Office: 2,489 Days
• Field of Search: 717/122
• US Class Current: 717/122
• CPC Class Codes: G06F 8/71 Version control security arrangements therefor G06F21/57; Configuration management

Abstract

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.

Claims

1. A computer-implemented network-based process for conflict detection and notification, comprising using a computer to perform the following process actions:

maintaining a list of edited project elements associated with a development project, each of said edited project elements having been previously edited by a first developer and representing an edited version of a previously created project element;

maintaining a list of related project elements which relate to the edited project elements, each of said related project elements being different from the edited project element it is related to and previously created versions of the edited project element it is related to, but having a dependency that exists between the related project element and the edited project element it is related to, and said related project elements list indicating, for each related project element, the edited project element it is related to, and exclusively listing only related project elements which relate to the edited project elements;

inputting an edit message identifying a project element associated with the project that a second developer is changing;

determining if the edit message identifies one of the edited project elements, using said list of edited project elements;

determining if the edit message identifies a project element that is related to an edited project element, using the related project elements list;

whenever the edit message identifies one of the edited project elements, notifying the first and second developers of a potential conflict; and

whenever the edit message identifies a project element that is related to an edited project element, notifying the first and second developers of a potential conflict between the edited project element and the project element identified in the edit message.

2. The process of claim 1, wherein the conflict is between program elements of a computer code being developed in a software development project by two or more programmers and so the project elements are program elements and the developers are programmers, and wherein the process action of notifying the second programmer of the potential conflict, comprises transmitting, via the network, a conflict message to the second programmer which identifies that the potential conflict exists between the first programmer'"'"'s version of a program element and the second programmer'"'"'s version of that element.

3. The process of claim 2, further comprising a process action of whenever a program element is being created rather than an existing one being changed by the second programmer, the edit message also identifies a program element or elements that are related to the program element being created.

4. The process of claim 2, the process action of notifying the second programmer of the potential conflict, comprises transmitting, via the network, a conflict message to the second programmer which identifies that the potential conflict exists between the edited program element and the program element identified in the edit message.

5. The process of claim 2, wherein each of said program elements comprises at least one of a file, a type comprising a class or interface, and a method.

6. The process of claim 5, wherein a related program element relates to an edited program element not only based on its dependency, but also based on a prescribed depth of dependency from the edited program element.

7. The process of claim 2, wherein the process actions of notifying the first and second programmers of a potential conflict is delayed until after the program element identified in the edit message is finished being created or the change being made thereto is complete.