Code conflict resolution system and method, apparatus, device, and medium

An apparatus, comprising:

• a memory configured to store instructions;
• and
• a processor coupled to the memory and configured to execute the instructions to cause the apparatus to:
• receive a conflict resolution result for a conflict field that is from a local apparatus, wherein the conflict field is from combining 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;
• store the conflict resolution result to provide the conflict resolution result to a remote apparatus;
• receive, from the remote apparatus, a first result of resolving the local irresolvable conflict block by a remote user;
• update, 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
• update, 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.

A computer program product comprising instructions stored on a non-transitory computer-readable medium that, when executed by a processor, cause an apparatus to:

• receive a conflict resolution result for a conflict field that is from a local apparatus, wherein the conflict field is from combining 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;
• store the conflict resolution result to provide the conflict resolution result to a remote apparatus;
• receive, from the remote apparatus, a first result of resolving the local irresolvable conflict block by a remote user;
• update, 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
• update, 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.