| 摘要 |
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. |
