Search

CN-122018876-A - Method, apparatus, device, medium, and article for merging codes

CN122018876ACN 122018876 ACN122018876 ACN 122018876ACN-122018876-A

Abstract

Embodiments of the present disclosure provide a method, apparatus, device, storage medium, and computer program product for merging code. The method includes displaying a first identifier and a second identifier, the second identifier selected from a plurality of identifiers, the first identifier corresponding to a first code and the second identifier corresponding to a second code. The method also includes receiving a first interaction, the first interaction for merging the first code and the second code. The method also includes displaying a conflict between the first code and the second code. The method also includes merging the first code and the second code by resolving the conflict in response to receiving the second interaction. According to the method of the embodiment of the disclosure, codes for merging can be flexibly set, the machine learning model is embedded into a mechanism for merging the codes, and the conflict is eliminated by one key, so that the efficiency of merging the codes is improved.

Inventors

  • MIAO HUI
  • ZHANG SUZHEN
  • CHEN XINTING
  • LIU YIZHOU
  • LI HAOYANG
  • Xu Puhang

Assignees

  • 北京字跳网络技术有限公司

Dates

Publication Date
20260512
Application Date
20260209

Claims (15)

  1. 1. A method for merging codes, comprising: displaying a first identifier and a second identifier, the second identifier being selected from a plurality of identifiers, the first identifier corresponding to a first code and the second identifier corresponding to a second code; Receiving a first interaction operation, wherein the first interaction operation is used for combining the first code and the second code; Displaying a conflict between the first code and the second code, and In response to receiving a second interaction, the first code and the second code are merged by eliminating the conflict.
  2. 2. The method of claim 1, wherein the conflict is displayed in a first page, the first page further comprising altered content of the first code relative to the second code.
  3. 3. The method of claim 2, further comprising: and in response to a third interaction with the changed content, displaying a changed code, wherein the changed code comprises a code corresponding to the changed content in the first code and a code corresponding to the changed content in the second code.
  4. 4. The method of claim 1, further comprising: obtaining a modification operation, wherein the modification operation is used for modifying the second identifier into a third identifier, the third identifier corresponds to a third code, and Displaying the first mark and the third mark.
  5. 5. The method of claim 1, wherein the first code comprises a plurality of code files, the method further comprising: In response to receiving a third interactive operation, fusing and displaying the first code and a fourth code, wherein the fourth code is a code of the second code corresponding to the conflict, and Displaying a file tree, wherein the file tree includes a first code file, the first code file being a code file of the plurality of code files that relates to the conflict.
  6. 6. The method of claim 1, wherein the conflict is displayed in a first page, the first page further comprising a first component, the second interaction being a click operation for the first component.
  7. 7. The method of claim 1, wherein the first code is determined based on a first session, the first session having a first context, and displaying a conflict between the first code and the second code comprises: Obtaining a first file using a first tool, wherein the first file includes the first marked code, the first marked code including a mark indicating a code of the first code that corresponds to the conflict; obtaining a first description, wherein the first description is determined by a first intelligent system based on the first context analyzing the tag of the first file, the first intelligent system having a first hint word, and Displaying the first description.
  8. 8. The method of claim 7, wherein merging the first code and the second code by eliminating the conflict comprises: Obtaining the processed first code, wherein the processed first code is determined by a second intelligent system based on the first file, the second intelligent system having a second hint word, and In response to the processed first code indicating that the conflict is resolved, the processed first code and the second code are combined to obtain a combined code.
  9. 9. The method of claim 8, further comprising: a first request is generated based on the merged code, wherein the first request is for providing the merged code to a third party.
  10. 10. The method of claim 8, further comprising: the context generated by the first intelligent system and the second intelligent system is merged into the first context.
  11. 11. The method of claim 8, further comprising: a hint is provided in response to the processed first code indicating that the conflict is not resolved.
  12. 12. The method of claim 11, further comprising: In response to receiving the abort operation, the processed first code is restored to the marked first code.
  13. 13. An apparatus for merging codes, comprising: A first display module configured to display a first identifier and a second identifier, the second identifier being selected from a plurality of identifiers, the first identifier corresponding to a first code and the second identifier corresponding to a second code; a receiving module configured to receive a first interaction, the first interaction being for merging the first code and the second code; a second display module configured to display a conflict between the first code and the second code, and And a merging module configured to merge the first code and the second code by eliminating the conflict in response to receiving a second interaction.
  14. 14. An electronic device, comprising: At least one processing unit; At least one memory coupled to the at least one processing unit and storing operations for execution by the at least one processing unit, the operations when executed by the at least one processing unit causing the electronic device to perform the method of any one of claims 1 to 12.
  15. 15. A computer program product having a computer program stored thereon, which, when executed by a processor, implements the method according to any of claims 1 to 12.

Description

Method, apparatus, device, medium, and article for merging codes Technical Field The present disclosure relates generally to the field of computers, and more particularly to methods, apparatuses, devices, computer readable storage media, and computer program products for merging code. Background The machine learning model steps into the development stage of high-speed iteration, and the continuous updating of the technology continuously expands the application scene boundary and the performance upper limit of the machine learning model. The machine learning technology taking the language model as the core representation is used for constructing a set of high-order technical system with accurate semantic understanding, flexible logic reasoning and high-quality content generation by virtue of large-scale data training and double energization of a deep neural network architecture, and realizing the technical span from simple language interaction to complex intelligent information processing. In particular, the machine learning model can efficiently process cross-domain and multi-level user query requests, and can show excellent technical performance no matter daily information consultation or professional knowledge solution. At present, the method has realized large-scale application in various fields such as intelligent customer service, educational answering, professional consultation and the like. For example, in the field of code development, a large model becomes a core auxiliary tool, and by virtue of learning accumulation and deep logic reasoning capability of massive codes, accurate conversion of natural language conversion codes is realized, and only needs a developer to describe functional requirements by using popular language, the executable codes which are adaptive to different technical stacks, have normal grammar and complete logic can be rapidly generated. Disclosure of Invention According to example embodiments of the present disclosure, a method, apparatus, device, computer storage medium, and computer program product for merging code are provided. In a first aspect of the present disclosure, a method for merging codes is provided, the method comprising displaying a first identifier and a second identifier, the second identifier being selected from a plurality of identifiers, the first identifier corresponding to a first code and the second identifier corresponding to a second code. The method also includes receiving a first interaction, the first interaction for merging the first code and the second code. The method also includes displaying a conflict between the first code and the second code. The method also includes merging the first code and the second code by resolving the conflict in response to receiving the second interaction. In a second aspect of the present disclosure, an apparatus for merging codes is provided, the apparatus comprising a first display module configured to display a first identifier and a second identifier, the second identifier being selected from a plurality of identifiers, the first identifier corresponding to a first code and the second identifier corresponding to a second code. The apparatus also includes a receiving module configured to receive a first interaction, the first interaction being for merging the first code and the second code. The apparatus also includes a second display module configured to display a conflict between the first code and the second code. The apparatus also includes a merging module configured to merge the first code and the second code by eliminating the conflict in response to receiving the second interaction. In a third aspect of the present disclosure, there is provided an electronic device comprising at least one processing unit, at least one memory coupled to the at least one processing unit and storing instructions for execution by the at least one processing unit, which instructions, when executed by the at least one processing unit, cause the electronic device to perform the method described according to the first aspect of the present disclosure. In a fourth aspect of the present disclosure, there is provided a computer readable storage medium having stored thereon machine executable instructions which, when executed by a device, cause the device to perform a method according to the first aspect of the present disclosure. In a fifth aspect of the present disclosure, there is provided a computer program product comprising computer executable instructions which, when executed by a processor, implement the method described in accordance with the first aspect of the present disclosure. The summary is provided to introduce a selection of concepts in a simplified form that are further described below in the detailed description. The summary is not intended to identify key features or essential features of the disclosure, nor is it intended to be used to limit the scope of the disclosure. Other features of the present disclosur