Patent ID: 11960879
Assignee: HUAWEI CLOUD COMPUTING TECHNOLOGIES CO., LTD.
Field: Computer technology (Electrical engineering)
Classification: CPC G | IPC G

Claim 0:
1. A method, comprising:
receiving, from a local apparatus, a conflict resolution result for a conflict field, wherein the conflict field is based on code files of a plurality of versions, wherein the conflict field comprises a conflict block, and wherein the conflict resolution result comprises an identifier of a local irresolvable conflict block;
storing the conflict resolution result to provide the conflict resolution result to a remote apparatus;
receiving, from the remote apparatus, a first result of resolving the local irresolvable conflict block by a remote user;
updating, based on the first result, a resolution rule, wherein the resolution rule is configured to be used by the local apparatus to resolve the conflict block; and
updating, based on a second result of confirming a resolution result of a local resolvable conflict block by the remote user, a confidence of the resolution rule.