# US 2018/0024890 A1 · Performing a closure merge operation

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

- Number: US 2018/0024890 A1
- Document ID: US20180024890A1
- Status: Published application
- Kind: A1
- Application number: 15/709,747
- Filed: 2017-09-20
- Published: 2018-01-25
- Earliest claimed: 2014-12-05
- Assignees: International Business Machines Corporation
- Applicants: International Business Machines Corporation
- Inventors: Kimberly D. Letkeman
- Web page: https://patentgrep.com/patent/US20180024890A1

## CPC

- G06F 11/1451: {by selection of backup contents}
- G06F 8/71: Version control (security arrangements therefor G06F21/57); Configuration management
- G06F 11/1464: {for networked environments}
- G06F 16/178: Techniques for file synchronisation in file systems
- G06F 16/1858: {Parallel file systems, i.e. file systems supporting multiple processors}
- G06F 2201/84: Using snapshots, i.e. a logical point-in-time copy of the data
- G06F: ELECTRIC DIGITAL DATA PROCESSING (computer systems based on specific computational models G06N)

## Abstract

In a method for data management, one or more processors identifying a source closure, a target file set, and a previously merged closure, wherein the source closure is a closure of files that includes changed files to merge into the target file set, and wherein the previously merged closure is a closure of files previously merged into the target file set. The method further includes one or more processors loading the identified source closure, the previously merged closure, and a closure of ancestor files shared by the identified source closure and the previously merged closure into a merge session. The method further includes one or more processors determining one or more file merge conflicts in the merge session based on differences between a comparison of the identified source closure to the closure of ancestor files and a comparison of the previously merged closure to the closure of ancestor files.

## Claims

### Claim 1

A method for data management, the method comprising:
identifying, by one or more processors, a source closure, a target file set, and a previously merged closure, wherein the source closure is a closure of files that includes changed files to merge into the target file set, and wherein the previously merged closure is a closure of files previously merged into the target file set;
loading, by one or more processors, the identified source closure, the previously merged closure, and a closure of ancestor files shared by the identified source closure and the previously merged closure into a merge session; and
determining, by one or more processors, one or more file merge conflicts in the merge session based on differences between a comparison of the identified source closure to the closure of ancestor files and a comparison of the previously merged closure to the closure of ancestor files.

### Claim 2 (depends on 1)

The method of claim 1, further comprising:
receiving, by one or more processors, input resolving at least one of the determined one or more file merge conflicts.

### Claim 3 (depends on 2)

The method of claim 2, further comprising:
determining, by one or more processors, whether the received input includes a request to complete the merge session;
responsive to determining that the received input does not include a request to complete the merge session, updating, by one or more processors, the closure of ancestor files in the merge session based on the received input; and
determining, by one or more processors, an updated set of one or more file merge conflicts in the merge session.

### Claim 4 (depends on 2)

The method of claim 2, further comprising:
determining, by one or more processors, whether the received input includes a request to complete the merge session;
responsive to determining that the received input does include a request to complete the merge session, determining, by one or more processors, whether the merge session includes at least one unresolved determined file merge conflict; and
responsive to determining that merge session does include at least one unresolved determined file merge conflict, determining, by one or more processors, an updated set of one or more file merge conflicts in the merge session.

### Claim 5 (depends on 2)

The method of claim 2, further comprising:
determining, by one or more processors, whether the received input includes a request to complete the merge session;
responsive to determining that the received input does include a request to complete the merge session, determining, by one or more processors, whether the merge session includes at least one unresolved determined file merge conflict; and
responsive to determining that merge session does not include at least one unresolved determined file merge conflict, updating, by one or more processors, the closure of ancestor files in the merge session based on the received input.

### Claim 6 (depends on 1)

The method of claim 1, wherein the determining one or more file merge conflicts in the merge session based on differences between a comparison of the identified source closure to the closure of ancestor files and a comparison of the previously merged closure to the closure of ancestor files, further comprises:
determining, by one or more processors, a first delta list between the identified source closure and the closure of ancestor files, wherein a delta list includes differences between two or more closures of files;
determining, by one or more processors, a second delta list between the previously merged closure and the closure of ancestor files; and
identifying, by one or more processors, conflicts between the first delta list and the second delta list.

### Claim 7 (depends on 1)

The method of claim 1, further comprising:
identifying, by one or more processors, one or more double delete files in the merge session, wherein a double delete file is a file that is present in the closure of ancestor files but is not present in either the identified source closure or the previously merged closure.

### Claim 8 (depends on 1)

The method of claim 1, further comprising:
identifying, by one or more processors, for each file included in the identified source closure and the previously merged closure, a most recent common ancestor file, wherein the previously merged closure is a most recent set of approved and merged files corresponding to files in the identified source closure; and
creating, by one or more processors, the closure of ancestor files to include the identified most recent common ancestor files.

### Claim 9 (depends on 1)

The method of claim 1, where a closure of files is a closure of models that includes all files that make up the models in the closure.

### Claim 10

A computer program product for data management, the computer program product comprising:
one or more computer readable storage media and program instructions stored on the one or more computer readable storage media, the program instructions comprising:
program instructions to identify a source closure, a target file set, and a previously merged closure, wherein the source closure is a closure of files that includes changed files to merge into the target file set, and wherein the previously merged closure is a closure of files previously merged into the target file set;
program instructions to load the identified source closure, the previously merged closure, and a closure of ancestor files shared by the identified source closure and the previously merged closure into a merge session; and
program instructions to determine one or more file merge conflicts in the merge session based on differences between a comparison of the identified source closure to the closure of ancestor files and a comparison of the previously merged closure to the closure of ancestor files.

### Claim 11 (depends on 10)

The computer program product of claim 10, further comprising program instructions, stored on the one or more computer readable storage media, to:
receive input resolving at least one of the determined one or more file merge conflicts.

### Claim 12 (depends on 11)

The computer program product of claim 11, further comprising program instructions, stored on the one or more computer readable storage media, to:
determine whether the received input includes a request to complete the merge session;
responsive to determining that the received input does not include a request to complete the merge session, update the closure of ancestor files in the merge session based on the received input; and
determine an updated set of one or more file merge conflicts in the merge session.

### Claim 13 (depends on 11)

The computer program product of claim 11, further comprising program instructions, stored on the one or more computer readable storage media, to:
determine whether the received input includes a request to complete the merge session;
responsive to determining that the received input does include a request to complete the merge session, determine whether the merge session includes at least one unresolved determined file merge conflict; and
responsive to determining that merge session does include at least one unresolved determined file merge conflict, determine an updated set of one or more file merge conflicts in the merge session.

### Claim 14 (depends on 11)

The computer program product of claim 11, further comprising program instructions, stored on the one or more computer readable storage media, to:
determine whether the received input includes a request to complete the merge session;
responsive to determining that the received input does include a request to complete the merge session, determine whether the merge session includes at least one unresolved determined file merge conflict; and
responsive to determining that the merge session does not include at least one unresolved determined file merge conflict, update the closure of ancestor files in the merge session based on the received input.

### Claim 15 (depends on 10)

The computer program product of claim 10, wherein the program instructions to determine one or more file merge conflicts in the merge session based on differences between a comparison of the identified source closure to the closure of ancestor files and a comparison of the previously merged closure to the closure of ancestor files, further comprises program instructions to:
determine a first delta list between the identified source closure and the closure of ancestor files, wherein a delta list includes differences between two or more closures of files;
determine a second delta list between the previously merged closure and the closure of ancestor files; and
identify conflicts between the first delta list and the second delta list.

### Claim 16 (depends on 10)

The computer program product of claim 10, further comprising program instructions, stored on the one or more computer readable storage media, to:
identify one or more double delete files in the merge session, wherein a double delete file is a file that is present in the closure of ancestor files but is not present in either the identified source closure or the previously merged closure.

### Claim 17 (depends on 10)

The computer program product of claim 10, further comprising program instructions, stored on the one or more computer readable storage media, to:
identify, for each file included in the identified source closure and the previously merged closure, a most recent common ancestor file, wherein the previously merged closure is a most recent set of approved and merged files corresponding to files in the identified source closure; and
create the closure of ancestor files to include the identified most recent common ancestor files.

### Claim 18

A computer system for data management, the computer system comprising:
one or more computer processors;
one or more computer readable storage media; and
program instructions stored on the computer readable storage media for execution by at least one of the one or more processors, the program instructions comprising:
program instructions to identify a source closure, a target file set, and a previously merged closure, wherein the source closure is a closure of files that includes changed files to merge into the target file set, and wherein the previously merged closure is a closure of files previously merged into the target file set;
program instructions to load the identified source closure, the previously merged closure, and a closure of ancestor files shared by the identified source closure and the previously merged closure into a merge session; and
program instructions to determine one or more file merge conflicts in the merge session based on differences between a comparison of the identified source closure to the closure of ancestor files and a comparison of the previously merged closure to the closure of ancestor files.

### Claim 19 (depends on 18)

The computer system of claim 18, further comprising program instructions, stored on the computer readable storage media for execution by at least one of the one or more processors, to:
receive input resolving at least one of the determined one or more file merge conflicts.

### Claim 20 (depends on 19)

The computer system of claim 19, further comprising program instructions, stored on the computer readable storage media for execution by at least one of the one or more processors, to:
determine whether the received input includes a request to complete the merge session;
responsive to determining that the received input does not include a request to complete the merge session, update the closure of ancestor files in the merge session based on the received input; and
determine an updated set of one or more file merge conflicts in the merge session.

### Claim 21 (depends on 19)

The computer system of claim 19, further comprising program instructions, stored on the computer readable storage media for execution by at least one of the one or more processors, to:
determine whether the received input includes a request to complete the merge session;
responsive to determining that the received input does include a request to complete the merge session, determine whether the merge session includes at least one unresolved determined file merge conflict; and
responsive to determining that merge session does include at least one unresolved determined file merge conflict, determine an updated set of one or more file merge conflicts in the merge session.

### Claim 22 (depends on 19)

The computer system of claim 19, further comprising program instructions, stored on the computer readable storage media for execution by at least one of the one or more processors, to:
determine whether the received input includes a request to complete the merge session;
responsive to determining that the received input does include a request to complete the merge session, determine whether the merge session includes at least one unresolved determined file merge conflict; and
responsive to determining that merge session does not include at least one unresolved determined file merge conflict, update the closure of ancestor files in the merge session based on the received input.

### Claim 23 (depends on 18)

The computer system of claim 18, wherein the program instructions to determine one or more file merge conflicts in the merge session based on differences between a comparison of the identified source closure to the closure of ancestor files and a comparison of the previously merged closure to the closure of ancestor files, further comprises program instructions to:
determine a first delta list between the identified source closure and the closure of ancestor files, wherein a delta list includes differences between two or more closures of files;
determine a second delta list between the previously merged closure and the closure of ancestor files; and
identify conflicts between the first delta list and the second delta list.

### Claim 24 (depends on 18)

The computer system of claim 18, further comprising program instructions, stored on the computer readable storage media for execution by at least one of the one or more processors, to:
identify one or more double delete files in the merge session, wherein a double delete file is a file that is present in the closure of ancestor files but is not present in either the identified source closure or the previously merged closure.

### Claim 25 (depends on 18)

The computer system of claim 18, further comprising program instructions, stored on the computer readable storage media for execution by at least one of the one or more processors, to:
identify, for each file included in the identified source closure and the previously merged closure, a most recent common ancestor file, wherein the previously merged closure is a most recent set of approved and merged files corresponding to files in the identified source closure; and
create the closure of ancestor files to include the identified most recent common ancestor files.
