# US 2015/0106790 A1 · Detecting merge conflicts and compilation errors in a collaborative integrated development environment

> Agents: this data is available as JSON from the patentgrep API and MCP server — see https://patentgrep.com/llms.txt

- Number: US 2015/0106790 A1
- Document ID: US20150106790A1
- Status: Published application
- Kind: A1
- Application number: 14/053,911
- Filed: 2013-10-15
- Published: 2015-04-16
- Earliest claimed: 2013-10-15
- Assignees: International Business Machines Corporation
- Applicants: International Business Machines Corporation
- Inventors: George T. Bigwood; Jason T. McMann; Michael G. Nikitaides; Kaleb D. Walton
- Web page: https://patentgrep.com/patent/US20150106790A1

## CPC

- G06F 11/3624: {by performing operations on the source code, e.g. via a compiler}
- G06F 8/71: Version control (security arrangements therefor G06F21/57); Configuration management
- G06F 11/36: Prevention of errors by analysis, debugging or testing of software
- G06F: ELECTRIC DIGITAL DATA PROCESSING (computer systems based on specific computational models G06N)

## Abstract

A method, system, and computer program product for detecting merge conflicts and compilation errors in a collaborative integrated development environment are provided in the illustrative embodiments. Prior to at least one user committing a set of uncommitted changes associated with a source code to a repository, the computer receives the set of uncommitted changes associated with the source code. The computer creates at least one temporary branch corresponding to the set of uncommitted changes associated with the source code. The computer device merges the at least one temporary branch to corresponding portions of the source code. The computer determines whether a merge conflict has occurred. If the merge conflict occurred, the computer communicates a first notification to the at least one user, the first notification indicating the merge conflict.

## Claims

### Claim 1

A method of detecting source code merge conflicts and compilation errors, the method comprising:
prior to at least one user uploading a set of uncommitted changes associated with a source code to a repository:
receiving, by a computer device, the set of uncommitted changes associated with the source code;
creating, by the computer device, at least one temporary branch corresponding to the set of uncommitted changes associated with the source code;
merging, by the computer device, the at least one temporary branch to corresponding portions of the source code;
determining, by the computer device, whether a merge conflict has occurred; and if so,
initiating, by the computer device, to communicate a first notification to the at least one user, the first notification indicating the merge conflict.

### Claim 2 (depends on 1)

The method according to claim 1, further comprising:
in response to merging the at least one temporary branch to corresponding portions of the source code without the merge conflict, forming, by the computer device, a first merged version of the source code, the first merged version comprising the at least one temporary branch;
performing, by the computer device, a build operation on the first merged version of the source code;
determining, by the computer device, whether a compilation error has occurred; and if so,
initiating, by the computer device, to communicate a second notification to the at least one user, the second notification indicating the compilation error.

### Claim 3 (depends on 1)

The method according to claim 1, further comprising:
receiving, by the computer device, a set of committed changes associated with the source code, the set of committed changes comprising changes permanently uploaded to the repository by the at least one user; and
in response to identifying that the set of committed changes is made to at least one branch associated with the source code, merging, by the computer device, the at least one temporary branch and the at least one branch to the corresponding portions of the source code.

### Claim 4 (depends on 3)

The method according to claim 3, further comprising:
in response to merging the at least one temporary branch and the at least one branch to the corresponding portions of the source code without the merge conflict, forming, by the computer device, a second merged version of the source code, the second merged version comprising the at least one temporary branch and the at least one branch;
performing, by the computer device, a build operation on the second merged version of the source code;
determining, by the computer device, whether a compilation error has occurred; and if so,
initiating, by the computer device, to communicate a third notification to the at least one user, the third notification indicating the compilation error.

### Claim 5 (depends on 2)

The method according to claim 2, further comprising modifying the first merged version by deleting at least one attachment associated with the first merged version.

### Claim 6 (depends on 1)

The method according to claim 1, wherein the computer device receives the set of uncommitted changes associated with the source code in response to the set of uncommitted changes exceeding a threshold value indicating a minimum amount of changes that should be made within the source code.

### Claim 7 (depends on 1)

The method according to claim 1, wherein the first notification further indicate: identity of the at least one user who created the set of uncommitted changes; the time when the set of uncommitted changes was created; and the version of the source code that comprises the set of uncommitted changes.

### Claim 8

A computer program product for detecting source code merge conflicts and compilation errors, the computer program product comprising:
one or more computer readable storage device and program instructions stored on the one or more computer readable storage device, the program instructions comprising:
prior to at least one user uploading a set of uncommitted changes associated with a source code to a repository:
program instructions to receive the set of uncommitted changes associated with the source code;
program instructions to create at least one temporary branch corresponding to the set of uncommitted changes associated with the source code;
program instructions to merge the at least one temporary branch to corresponding portions of the source code;
program instructions to determine whether a merge conflict has occurred; and if so,
program instructions to initiate to communicate a first notification to the at least one user, the first notification indicating the merge conflict.

### Claim 9 (depends on 1)

The computer program product according to claim 1, further comprising:
in response to merging the at least one temporary branch to corresponding portions of the source code without the merge conflict, program instructions to form a first merged version of the source code, the first merged version comprising the at least one temporary branch;
program instructions to perform a build operation on the first merged version of the source code;
program instructions to determine whether a compilation error has occurred; and if so,
program instructions to initiate to communicate a second notification to the at least one user, the second notification indicating the compilation error.

### Claim 10 (depends on 8)

The computer program product according to claim 8, further comprising:
program instructions to receive a set of committed changes associated with the source code, the set of committed changes comprising changes permanently uploaded to the repository by the at least one user; and
in response to identifying that the set of committed changes is made to at least one branch associated with the source code, program instructions to merge the at least one temporary branch and the at least one branch to the corresponding portions of the source code.

### Claim 11 (depends on 10)

The computer program product according to claim 10, further comprising:
in response to merging the at least one temporary branch and the at least one branch to the corresponding portions of the source code without the merge conflict, program instructions to form a second merged version of the source code, the second merged version comprising the at least one temporary branch and the at least one branch;
program instructions to perform a build operation on the second merged version of the source code;
program instructions to determine whether a compilation error has occurred; and if so,
program instructions to initiate to communicate a third notification to the at least one user, the third notification indicating the compilation error.

### Claim 12 (depends on 9)

The computer program product according to claim 9, further comprising program instructions to modify the first merged version by deleting at least one attachment associated with the first merged version.

### Claim 13 (depends on 8)

The computer program product according to claim 8, wherein the program instructions to receive the set of uncommitted changes associated with the source code are executed by at least one of the one or more processors in response to the set of uncommitted changes exceeding a threshold value indicating a minimum amount of changes that should be made within the source code.

### Claim 14 (depends on 8)

The computer program product according to claim 8, wherein the first notification further indicate: identity of the at least one user who created the set of uncommitted changes; the time when the set of uncommitted changes was created; and the version of the source code that comprises the set of uncommitted changes.

### Claim 15

A computer system for detecting source code merge conflicts and compilation errors, the computer system comprising:
one or more computer processors;
one or more computer readable storage device;
program instructions stored on the computer readable storage device for execution by at least one of the one or more processors, the program instructions comprising:
prior to at least one user uploading a set of uncommitted changes associated with a source code to a repository:
program instructions to receive the set of uncommitted changes associated with the source code;
program instructions to create at least one temporary branch corresponding to the set of uncommitted changes associated with the source code;
program instructions to merge the at least one temporary branch to corresponding portions of the source code;
program instructions to determine whether a merge conflict has occurred; and if so,
program instructions to initiate to communicate a first notification to the at least one user, the first notification indicating the merge conflict.

### Claim 16 (depends on 15)

The computer system according to claim 15, further comprising:
in response to merging the at least one temporary branch to corresponding portions of the source code without the merge conflict, program instructions to form a first merged version of the source code, the first merged version comprising the at least one temporary branch;
program instructions to perform a build operation on the first merged version of the source code;
program instructions to determine whether a compilation error has occurred; and if so,
program instructions to initiate to communicate a second notification to the at least one user, the second notification indicating the compilation error.

### Claim 17 (depends on 15)

The computer system according to claim 15, further comprising:
program instructions to receive a set of committed changes associated with the source code, the set of committed changes comprising changes permanently uploaded to the repository by the at least one user; and
in response to identifying that the set of committed changes is made to at least one branch associated with the source code, program instructions to merge the at least one temporary branch and the at least one branch to the corresponding portions of the source code.

### Claim 18 (depends on 17)

The computer system according to claim 17, further comprising:
in response to merging the at least one temporary branch and the at least one branch to the corresponding portions of the source code without the merge conflict, program instructions to form a second merged version of the source code, the second merged version comprising the at least one temporary branch and the at least one branch;
program instructions to perform a build operation on the second merged version of the source code;
program instructions to determine whether a compilation error has occurred; and if so,
program instructions to initiate to communicate a third notification to the at least one user, the third notification indicating the compilation error.

### Claim 19 (depends on 16)

The computer system according to claim 16, further comprising program instructions to modify the first merged version by deleting at least one attachment associated with the first merged version.

### Claim 20 (depends on 15)

The computer system according to claim 15, wherein the program instructions to receive the set of uncommitted changes associated with the source code are executed in response to the set of uncommitted changes exceeding a threshold value indicating a minimum amount of changes that should be made within the source code.
