Browse Prior Art Database

System and Method for realtime conflict detection of version controlled artifacts

IP.com Disclosure Number: IPCOM000244472D
Publication Date: 2015-Dec-15
Document File: 3 page(s) / 106K

Publishing Venue

The IP.com Prior Art Database

Abstract

The core idea of this disclosure is to provide a way for real time notification of potential code conflict among the developers who work on the same piece of code. The notification is done by providing a separate channel for change (i.e. diff) dissemination. A background process continuously monitor the changes made by developer and sends the diff to version control server. If any other developer is editing the same file, they will receive the notification and the diff, so the editor can generate warning in a realtime manner.

This text was extracted from a PDF file.
This is the abbreviated version, containing approximately 53% of the total text.

Page 01 of 3

System and Method for realtime conflict detection of version controlled artifacts

As a developer, it is usually a huge pain when trying to merge a bunch of code from the source code repository to our current working space, and most of the pain comes from conflict resolution. Sometime it is obvious how to resolve the conflicts, but sometimes it could be very hard. We might need to talk with the owner of previous changes to get the context and rationale of their change before we can resolve the change in a reasonable way. It would make life much easier if the tool and version control system provides an easier way to detect the source code conflict at early stage so that developers can resolve the issue with minimal effort.

The core idea of this disclosure is to provide a way for real time notification of potential code conflict among the developers who work on the same piece of code. The notification is done by providing a separate channel for change (i.e. diff) dissemination. This is how it works :

     1. For every fixed interval, or whenever user save the file, a local diff is generated by comparing the local version of the code with the latest version on server.

     2. The local diff is sent to the version controller server, so that server has a temporary copy of the diff for a particular developer on particular code. Note that the code is not officially submit to server.

     3. For each file being modified, The version control server keep a table of aggregated diff history. The table contains the information of "who" changed "which part" of the file.

     4. Whenever a new diff is received, the server compare the area of change described in the diff file with the table. This allow the server to detect potential change conflict.

> if no conflict detected, the server return a positive response to the client agent

> if conflict is detected, the server return the client agent which user's temporary change has conflict with current user.

The claim of this disclosure is :

1. Periodically diff generation on developer's machine and store a temporary copy on the server side.

     2. The version control server maintains a "edit range" table for each open file. When the new temporary diff received from client, the server can easily detect potential conflict


3. The version control server send notifica...