WO2023249156A1

WO2023249156A1 - Electronic device for providing code information and method thereof

Info

Publication number: WO2023249156A1
Application number: PCT/KR2022/010049
Authority: WO
Inventors: 이상용; 김선우
Original assignee: 쿠팡 주식회사
Priority date: 2022-06-24
Filing date: 2022-07-11
Publication date: 2023-12-28
Also published as: KR20240000809A

Abstract

The present disclosure relates to an electronic device for providing code information and a method thereof. The method for providing code information by an electronic device according to an embodiment of the present disclosure comprises the steps of: obtaining project information from at least one worker terminal; obtaining at least two pieces of branch information corresponding to the project information from the at least one worker terminal; verifying, for a conflict test, a merge combination on the basis of a combination of the at least two pieces of branch information; and providing code conflict information to the at least one worker terminal on the basis of a result of performing the conflict test on the merge combination.

Description

Electronic device and method for providing code information

This disclosure relates to an electronic device and method for providing code information. More specifically, the present disclosure relates to an electronic device and method for providing conflict information about code written by a plurality of workers for a project.

Since the Fourth Industrial Revolution, the next-generation industrial revolution achieved through the convergence of information and communication technologies, has emerged as a key topic, the importance of software technology has emerged. Software technology can be used in a variety of fields such as ubiquitous computing, Internet of Things, self-driving cars, artificial intelligence, robots, and blockchain, and the trend of implementing software products by reflecting market goals and user needs has led to a large number of developers. Development projects involving people are flourishing.

Development projects involving multiple developers merge the results of tasks assigned to each individual developer to complete one project. However, when merging source code worked by each developer, the possibility of physical or logical conflicts occurring is significantly high, and various methods have been proposed to improve the productivity of projects by multiple developers. Typically, a source code automatic merging function has been proposed that replaces syntax in which conflicts between source codes occur with the latest syntax, but it has the problem that it is difficult for the developer's intention to be accurately reflected in the automatic merging results and development content is lost. Accordingly, the need for technology to accurately reflect the developer's intention, prevent loss of development content, and improve project productivity is increasing.

In relation to this, prior documents such as KR1020210147354A and KR1020210090575A may be referred to.

The purpose of the present disclosure is to provide an electronic device and method for providing code information to an operator in order to solve the above-mentioned problems.

Specifically, in the process of work related to a project performed by multiple workers, each worker modifies and updates the code related to the project in his or her own branch. As a result, multiple workers work on the same project. Conflicts may occur as the code is modified, and the occurrence of such a conflict could be confirmed by performing a merge during the build process for service deployment. However, this disclosure determines whether there is a conflict in the code of each branch. The purpose is to provide an electronic device and method that can resolve conflict problems even before service deployment by periodically monitoring and providing information about detected conflicts to workers.

Additionally, the present disclosure aims to provide an electronic device and method for providing project-related work status information to workers.

The technical problems to be achieved by the present disclosure are not limited to the technical problems described above, and other technical problems can be inferred from the following embodiments.

In a method of providing code information by an electronic device according to an embodiment of the present disclosure, the method of providing code information includes obtaining project information from at least one worker terminal, and receiving project information corresponding to the project information from the at least one worker terminal. Obtaining at least two pieces of branch information, confirming a merge combination based on the combination of the at least two branch information for a conflict test, and testing the conflict for the merge combination. It includes providing code conflict information to the at least one worker terminal based on the result of performing.

As an example, the code conflict information includes a first conflict information list that occurred for the merge combination, and the conflict information list includes branch information in which a conflict occurred for the merge combination, file information related to the conflict, and the branch information. Contains at least part of the corresponding tag information.

As an example, the code information providing method, when a first worker input corresponding to the first conflict information list is obtained, provides code part information in which a conflict occurred with respect to file information corresponding to the first worker input to the first worker terminal. It further includes steps provided to.

As an example, the code information providing method further includes obtaining worker identification information from the at least one worker terminal and providing a second conflict information list corresponding to the worker identification information to the at least one worker terminal. do.

As an example, the code information providing method further includes obtaining branch identification information from the at least one worker terminal and providing a third conflict information list corresponding to the branch identification information to the at least one worker terminal. do.

As an example, the code conflict information includes a list of worker information that performed work on the same file, and the worker information list includes branch information corresponding to the file, tag information corresponding to the branch information, and information corresponding to the file. Contains at least some of the commit information,

As an example, the code information providing method provides code change information for file information corresponding to the second worker input to the second worker terminal when a second worker input corresponding to the first worker information list is obtained. .

As an example, the code conflict information includes a list of branch information derived from master branch information.

As an example, the step of checking a merge combination related to the project information for the conflict test is performed when commit information related to at least some of the at least two branch information is obtained.

For example, the step of checking a merge combination related to the project information for the conflict test is performed according to a cycle set by an administrator of the electronic device.

For example, the merge combination may include a merge combination of the at least two branch information, a merge combination of the at least two pieces of file information related to the first branch information, and a merge combination of the program code included in the first file information. Includes at least some

According to an embodiment of the present disclosure, in a computer program combined with hardware and stored in a computer-readable storage medium to provide code information, the computer program obtains project information from at least one worker terminal, and the at least one Obtaining at least two branch information corresponding to the project information from a worker terminal, confirming a merge combination based on the combination of the at least two branch information for conflict testing, and performing the conflict test on the merge combination. Based on the results, code conflict information is provided to the at least one worker terminal.

An electronic device that provides code information according to an embodiment of the present disclosure, wherein the electronic device includes a transceiver, a memory for storing instructions, and a processor, and the processor connected to the transceiver and the memory includes at least one worker terminal. Obtain project information from, obtain at least two branch information corresponding to the project information from the at least one worker terminal, and confirm a merge combination based on the combination of the at least two branch information for conflict testing, Code conflict information is provided to the at least one worker terminal based on a result of performing the conflict test for the merge combination.

The electronic device and method for providing code information according to the present disclosure check in advance conflict information generated by individual modification of each code related to the project before the build process for service distribution for a plurality of program codes related to the project. And by providing this to workers, conflict situations can be notified in advance to preemptively resolve conflicts and improve project productivity.

In addition, the electronic device and method for providing code information according to the present disclosure can intuitively provide information on the project progress to the worker by providing the worker with the status of work related to the project.

The effects of the present disclosure are not limited to the effects described above, and other effects not mentioned may be clearly understood by those skilled in the art from the description of the claims.

1 is a diagram illustrating a system for providing code information according to an embodiment of the present disclosure.

Figure 2 is a diagram showing the data structure of a project in which code information is provided according to an embodiment of the present disclosure.

Figure 3 is a flowchart for explaining a method of providing code information according to an embodiment of the present disclosure.

4A to 4C are diagrams showing a page providing code information according to a first function according to an embodiment of the present disclosure.

5A and 5B are diagrams showing a page providing code information according to a second function according to an embodiment of the present disclosure.

FIG. 6 is a diagram illustrating a page that provides code information according to a third function according to an embodiment of the present disclosure.

FIG. 7 is a diagram illustrating an electronic device for providing code information according to an embodiment of the present disclosure.

Hereinafter, embodiments of the present disclosure will be described clearly and in detail so that those skilled in the art can easily practice the present invention.

The terms used in this specification are for describing embodiments and are not intended to limit the disclosure. Unless otherwise defined, all terms (including technical and scientific terms) used in this specification may be used with a meaning that can be commonly understood by those skilled in the art to which this disclosure pertains. It may vary depending on the intentions or precedents of engineers working in the field, the emergence of new technologies, etc.

Additionally, terms defined in commonly used dictionaries are not interpreted ideally or excessively unless clearly specifically defined. In certain cases, there are terms arbitrarily selected by the applicant, and in this case, the meaning will be described in detail in the relevant description section. Therefore, the terms used in this disclosure should be defined based on the meaning of the term and the overall content of this disclosure, rather than simply the name of the term.

Throughout this specification, when a part “includes” a certain component, this does not mean that other components are excluded, but may further include other components, unless specifically stated to the contrary. Additionally, as used herein, the singular form also includes the plural form unless specifically stated otherwise in the phrase. In addition, the expression “at least one of a, b, and c” described throughout the specification means ‘a alone’, ‘b alone’, ‘c alone’, ‘a and b’, ‘a and c’, ‘b and c', or 'all of a, b, and c'.

Meanwhile, terms such as “first and/or second” used in this specification may be used to describe various components, but are only used for the purpose of distinguishing one component from other components. It is not intended to be limited to the components referred to by that term. For example, without departing from the scope of the present invention, a first component may be named a second component, and the second component may also be named a first component.

In addition, “…” described in this specification. wealth", "… Terms such as “module” refer to a unit that processes at least one function or operation, which may be implemented as hardware or software, or as a combination of hardware and software. Additionally, embodiments of the present disclosure may be represented by functional block configurations and various processing steps. These functional blocks may be implemented in various numbers of hardware or/and software configurations that execute specific functions. For example, embodiments of the present disclosure include memory, processing, logic, look-up tables, etc. that can execute various functions under the control of one or more microprocessors or other control devices. Direct circuit configurations can be employed.

Similar to the fact that the components disclosed herein can be implemented as software programming or software elements, embodiments of the present disclosure include various algorithms implemented as combinations of data structures, processes, routines or other programming constructs, including: It can be implemented in a programming or scripting language such as C, C++, Java, assembler, etc. Functional aspects may be implemented as algorithms running on one or more processors. Additionally, the present embodiment may employ prior art for at least one of electronic environment setting, signal processing, and data processing. Terms such as “mechanism,” “element,” “means,” and “configuration” are broadly used. It can be used and is not limited to mechanical and physical components. The term may include the meaning of a series of software routines in connection with a processor, etc.

Each block of the processing flow diagrams attached to this specification and combinations of the flow diagram diagrams may be performed by computer program instructions. These computer program instructions can be mounted on a processor of a general-purpose computer, special-purpose computer, or other programmable data processing equipment, so that the instructions performed through the processor of the computer or other programmable data processing equipment are described in the flow chart block(s). It creates the means to perform functions.

These computer program instructions may be stored in computer-usable or computer-readable memory that can be directed to a computer or other programmable data processing equipment to implement a function in a particular manner. It is also possible to produce manufactured items containing instruction means that perform the functions described in the flowchart block(s).

Computer program instructions can also be mounted on a computer or other programmable data processing equipment, so that a series of operational steps are performed on the computer or other programmable data processing equipment to create a process that is executed by the computer, thereby generating a process that is executed by the computer or other programmable data processing equipment. Instructions that perform processing equipment may also provide steps for executing the functions described in the flow diagram block(s).

Additionally, each block may represent a module, segment, or portion of code that includes one or more executable instructions for executing specified logical function(s). Additionally, in some alternative execution examples, it may be possible for the functions mentioned in the blocks to occur out of order. For example, it is possible for two blocks shown in succession to be performed substantially at the same time, or it is possible for the blocks to be performed in reverse order depending on the corresponding function.

The “electronic device” or “terminal” referred to in this specification may be implemented as a computer or portable terminal that can connect to a server or other terminal through a network. Here, the computer includes, for example, a laptop, desktop, laptop, etc. equipped with a web browser, and the portable terminal is, for example, a wireless communication device that guarantees portability and mobility. , all types of communication-based terminals such as IMT (International Mobile Telecommunication), CDMA (Code Division Multiple Access), W-CDMA (W-Code Division Multiple Access), and LTE (Long Term Evolution), smartphones, tablet PCs, etc. It may include a handheld-based wireless communication device. In addition, the "electronic device" or "terminal" referred to in this specification includes a processor, memory for storing and executing program data, permanent storage such as a disk drive, a communication port for communicating with an external device, a touch panel, User interface devices such as keys, buttons, etc. may also be included.

In the present disclosure, methods implemented as software modules or algorithms may be stored on a computer-readable recording medium as computer-readable codes or program instructions executable on a processor. Here, computer-readable recording media include magnetic storage media (e.g., ROM (read-only memory), RAM (random-access memory), floppy disk, hard disk, etc.) and optical read media (e.g., CD-ROM). ), DVD (Digital Versatile Disc), etc. Computer-readable recording media can be distributed and executed on networked computer systems.

Hereinafter, various embodiments of the present disclosure will be described in detail with reference to the attached drawings. In describing the embodiments, description will be omitted for technical content that is well known in the technical field to which the present invention belongs and that is not directly related to the present invention. This is to convey the gist of the present invention more clearly without obscuring it by omitting unnecessary explanation. For the same reason, some components are exaggerated, omitted, or schematically shown in the accompanying drawings. Additionally, the size of each component does not entirely reflect its actual size. In this specification, the same reference numerals throughout may refer to the same or corresponding elements.

FIG. 1 is a diagram illustrating a system 10 for providing code information according to an embodiment of the present disclosure. Referring to FIG. 1, the system 10 for providing code information according to an embodiment of the present disclosure may include an electronic device 110 and first to nth worker terminals 120_1, 120_2, ..., 120_n. . The electronic device 110 may communicate with the first to nth worker terminals 120_1, 120_2, ..., 120_n through a mutual network and exchange information.

For example, the network may be at least one of a Personal Area Network (PAN), a Local Area Network (LAN), a Campus Area Network (CAN), a Metropolitan Area Network (MAN), a Wide Area Network (WAN), a Broad Band Network (BBN), and the Internet. Can contain one network. Additionally, the network may include at least one of network topologies including a bus network, star network, ring network, mesh network, star-bus network, tree, or hierarchical network. In an embodiment of the present disclosure, the mutual communication method between the electronic device 110 and the first to nth worker terminals 120_1, 120_2, ..., 120_n is not limited to the type of network described above, and may include any network type. It can include not only communication methods using a communication network, but also short-range wireless communication between devices.

In an embodiment of the present disclosure, the electronic device 110 may include a transceiver, memory, and processor. Additionally, the electronic device 110 refers to a unit that processes at least one function or operation, and may be implemented with hardware, software, or a combination of hardware and software. In an embodiment, the electronic device 110 may include multiple computer systems or computer software implemented as a network server. As an example, the electronic device 110 is a computer that is connected to a lower-level device that can communicate with another network server through a computer network such as an intranet or the Internet, receives a request to perform a task, performs the task, and provides a performance result. It can refer to systems and computer software.

In addition, the electronic device 110 can be understood as a broad concept that includes a series of application programs that can operate on a network server and various databases built therein. For example, the electronic device 110 uses a network server program provided in various ways depending on the operating system, such as DOS, Windows, Linux, Unix, or MacOS. This can be implemented.

In an embodiment of the present disclosure, the electronic device 110 may obtain a program code related to a project from at least one of the first to nth worker terminals 120_1, 120_2, ..., 120_n. Program code may be included in file information related to the project and may include multiple code lines. The electronic device 110 periodically performs a conflict test on program code before merging a plurality of program codes related to a project, and provides code conflict information based on the results of the conflict test. It can be provided to at least one of the 1st to nth worker terminals (120_1, 120_2, ..., 120_n).

Meanwhile, in the embodiment, each worker may work on each worker terminal (120_1, 120_2, ..., or 120_n), but is not limited thereto, and may update the code worked on the branch corresponding to the worker on the server related to the project. You can. In this way, by checking the overall list of branches related to the project and checking for conflicts in advance, you can check whether conflicts have occurred according to the modifications made by workers, and through this, unwanted conflicts can be modified.

According to an embodiment of the present disclosure, the code conflict information provided from the electronic device 110 to at least one of the first to nth worker terminals 120_1, 120_2, ..., 120_n includes branch information where the code conflict occurred, code Information on the file where the conflict occurred, information on the worker who performed work on the file where the code conflict occurred, information on the code part where the code conflict occurred, code change information on which the modification was performed, tag information corresponding to branch information, and file information. It may include at least some of the commit information corresponding to . A commit operation may refer to the operation of storing added file information or edited file information in a storage, and in an embodiment of the present disclosure, the commit information may include information related to the commit operation. Detailed information included in the code conflict information provided from the electronic device 110 to at least one of the first to nth worker terminals 120_1, 120_2, ..., 120_n may vary depending on the function provided by the electronic device 110. Code conflict information provided according to the function of the electronic device 110 will be described in detail in FIGS. 4A to 6 to be described later.

Although not shown, in an embodiment of the present disclosure, the system 10 for providing code information may further include a server for storing project-related information provided from the electronic device 110. Project-related information stored in the server is derived from at least one of the first to nth worker terminals (120_1, 120_2, ..., 120_n) by program codes related to the project, task information related to each program code, and the electronic device 110. It may contain at least some of the code conflict information. In an embodiment, the server may be a component for security of stored information, may be included in the electronic device 110, or may be a component independent of the electronic device 110. Meanwhile, the electronic device 110 may perform a push operation based on commit information. A push operation may mean saving added file information or edited file information to a remote storage, and in an embodiment, the remote storage may be the server described above.

In an embodiment, the server may further store project history information derived based on project-related information obtained from the electronic device 110. Additionally, the server may provide at least some of the stored project-related information to at least one of the first to nth worker terminals (120_1, 120_2, ..., 120_n) in response to the worker's request. Additionally, in an embodiment of the present disclosure, the electronic device 110 may provide project-related work status information to at least one of the first to nth worker terminals 120_1, 120_2, ..., 120_n. Work status information related to the project can be derived from project-related information and project history information stored in the server, and is provided to at least one of the first to nth worker terminals (120_1, 120_2, ..., 120_n) in response to the worker's request. It can be.

According to an embodiment of the present disclosure, prior to merging a plurality of program codes related to a project, conflict information arising from individual modifications of each code is provided to the worker, thereby notifying the conflict situation in advance and preemptively resolving the conflict. This can improve the productivity of the project. In addition, according to the present disclosure, by providing work status related to the project to the worker, information on the project progress can be intuitively provided to the worker. A detailed description of the method for providing code information according to an embodiment of the present disclosure will be described later with reference to FIGS. 2 to 7.

FIG. 2 is a diagram illustrating the data structure 20 of the project 200 in which code information is provided according to an embodiment of the present disclosure. Referring to FIG. 2, from one project 200, a master branch (MB), a development branch (DB), a first feature branch (FB1), and a second feature branch ( FB2) can be derived. However, the data structure 20 shown in FIG. 2 is only an example to aid understanding of the present disclosure, and does not limit the data structure 20 in which code information is provided according to an embodiment of the present disclosure, and the data structure ( 20) can be adaptively built according to the goals of the project 200.

The master branch (MB) may be a branch for managing release history related to the project 200 and may manage a set of files in a deployable state. 2 shows a master branch (MB) including a first master file set 210 and a second master file set 220, and the first program or second master built from the first master file set 210 A second program built from fileset 220 may be distributed, where the second program may be another version of the first program. Each of the plurality of files included in the first master file set 210 and the second master file set 220 may be a file committed by the first to nth worker terminals (120_1, 120_2, ..., 120_n). .

The development branch (DB) may be a branch for merging branches for developing various functions related to the project 200. If the set of files associated with the development branch (DB) contains all features related to the program to be deployed, bugs have been fixed and it is in a stable state ready for deployment, the development branch (DB) can be merged into the master branch (MB). . Each of the first to third development file sets 211, 212, and 213 of FIG. 2 may include a plurality of files for developing various functions related to the program corresponding to the second master file set 220. In, the second set of development files 212 may be from the first set of development files 211, the third set of development files 213 may be an updated version of the second set of development files 212, or the set of files from the first set of development files 211 may be an updated version of the first set of development files 211. Each of the to third development file sets 211, 212, and 213 may be a set of files for implementing independent functions related to the program corresponding to the second master file set 220. Each of the plurality of files included in each of the first to third development file sets 211, 212, and 213 may be a file committed by the first to nth worker terminals 120_1, 120_2, ..., 120_n.

The first feature branch (FB1) and the second feature branch (FB2) may be branches branched from the development branch (DB) to develop new functions and fix bugs related to the project 200. When work related to the first feature branch (FB1) and the second feature branch (FB2) is completed, the sets of files associated with the first feature branch (FB1) and the second feature branch (FB2) are merged into the development branch (DB). It can be. 2 shows that work related to the second feature branch FB2 is completed, and at least one of the 2-1 feature file set 212_1 and the 2-2 feature file set 212_2 is merged into the development branch DB. , shows the data structure 20 when work related to the first feature branch FB1 is in progress.

In addition, the data structure 20 of the project 200 according to the embodiment of the present disclosure includes a release branch branching from the development branch (DB) and urgent modifications to the distributed product version in order to prepare the product release version. When this occurs, at least one of hotfix branches branching from the master branch (MB) may be further included to handle this. The branch information referred to in this specification may be information corresponding to at least one of a master branch (MB), development branch (DB), feature branch (FB1, FB2), distribution branch, and hotfix branch related to the project 200, Branch information may include information about a set of files related to the branch. Additionally, the file information referred to in this specification may include information about at least one file included in the file set, and the file information may include information about program code related to the file.

Meanwhile, in an embodiment, a branch within a project may have a different structure depending on the worker, and the embodiment of the present specification checks the entire branch list related to the project and merges each combination of branches in the branch list. ) can be checked in advance to determine whether a conflict has occurred.

In step S310, the electronic device 110 according to an embodiment of the present disclosure may obtain project information from at least one of the first to nth worker terminals 120_1, 120_2, ..., 120_n. Project information may include a basic file information set related to the project, and the basic file information set may include a plurality of program codes for implementing a program related to the project.

In step S320, the electronic device 110 according to an embodiment of the present disclosure may obtain at least two branch information related to the project from at least one of the first to nth worker terminals 120_1, 120_2, ..., 120_n. . The branch information may be at least one of branch information corresponding to a file in which at least one file information included in the basic file information set has been modified and branch information corresponding to a newly created file related to the project, and the branch information It may contain a set of file information corresponding to . The file information set may include a plurality of file information, and each of the plurality of file information may include program code including a plurality of code lines.

In step S330, the electronic device 110 according to an embodiment of the present disclosure may check a merge combination related to the project for a conflict test. The merge combination may be a combination of objects expected to be merged into program code for distribution. In an embodiment, the merge combination is a combination of a merge between at least two branch information, and at least two file information related to one branch information. It may include at least some of a merge combination between the files and a merge combination of program codes included in one file information.

Specifically, a simple merge combination of at least two branch information may be a combination of a first branch and a second branch to implement different functions. A merge combination of at least two pieces of file information related to one branch information may be a combination of first file information and second file information related to first branch information. Meanwhile, the merge combination for the program code included in one file information may be the first code line and the second code line included in the program code included in the first file information. According to an embodiment of the present disclosure, the merge combination confirmed from the electronic device 110 may be a combination of entities that have a physical or logical relationship between branches, files, or code lines.

In step S340, the electronic device 110 according to an embodiment of the present disclosure may perform a conflict test on the confirmed merge combination. Conflict testing can be performed by checking whether a physical or logical conflict occurs for the merge combination. A physical conflict can be a conflict that can occur when multiple workers modify a code line in the same location, and a logical conflict can be a conflict that can occur due to the relationship between at least two code lines in different locations. You can. In an embodiment, the electronic device 110 may perform a conflict test on all merge combinations confirmed in step S330.

Meanwhile, in some embodiments, when performing a conflict test, the electronic device 110 may perform a conflict test on some selected merge combinations to reduce the load. Specifically, in step S320, first branch information and second branch information are obtained, the first branch information includes modification information for the first file related to the first branch, and the second branch information is related to the second branch. If the modified second file contains modification information, the electronic device 110 may perform a conflict test by selecting a merge combination related to the first branch and the second branch.

In step S350, the electronic device 110 according to an embodiment of the present disclosure sends code conflict information to one of the first to nth worker terminals 120_1, 120_2, ..., 120_n based on the result of the conflict test performed in step S340. You can provide at least one. Code conflict information includes information on the branch where the code conflict occurred, information on the file where the code conflict occurred, information on the worker who performed work on the file where the code conflict occurred, information on the code part where the code conflict occurred, information on the code change on which the modification was performed, and branch information. It may include at least part of tag information corresponding to the information and commit information corresponding to the file information. In an embodiment, detailed items of code conflict information provided by the electronic device 110 to at least one of the first to nth worker terminals 120_1, 120_2, ..., 120_n are related to the function provided by the electronic device 110. It may vary depending on the condition. Meanwhile, in an embodiment, conflict information may be provided to each worker for the branch combination in which the conflict occurred.

Conflict tests according to embodiments of the present disclosure may be performed at regular intervals. For example, the conflict test may be performed in response to a cycle preset by the administrator of the electronic device 110, and the merge combination may be confirmed prior to the conflict test. Meanwhile, a conflict test according to another embodiment of the present disclosure can be performed when commit information related to a program is obtained. Commit information can be obtained when a worker completes work on a corresponding file and provides completed work information to the electronic device 110.

4A to 4C are diagrams showing a page providing code information according to a first function according to an embodiment of the present disclosure. In an embodiment, the first function may be a function for providing code conflict information that occurs regarding a merge combination.

The first page 40a for providing code conflict information according to the first function shown in FIG. 4A may be provided in response to an operator's input on the first tab 400 corresponding to the first function. Referring to FIG. 4A, the first page 40a includes a first input unit 410 for obtaining project identification information from an operator, a conflict information list 420 including code conflict information provided in response to the project identification information, It may include a second input unit 430 for obtaining worker identification information from the worker and a third input unit 440 for obtaining branch identification information from the worker.

The electronic device 110 may obtain project identification information through the first input unit 410 and provide a conflict information list 420 corresponding to the project identification information on the first page 40a. The conflict information list 420 may include information related to program code in which a conflict occurred, based on the results of a conflict test. Specifically, the conflict information list 420 includes the first branch information 421 where the conflict occurred, tag information 422 corresponding to the first branch information, file information 423 where the conflict occurred, and the first branch and the conflict occurred. It may include second branch information 424, and the tag information 422 may include version information related to the first branch information 421. Additionally, the conflict information list 420 may include an icon 425 to provide detailed information about the conflict situation.

When a worker input for the icon 425 is obtained, the electronic device 110 can provide detailed information about the conflict situation to the worker through the worker terminal, a detailed description of which will be described later with reference to FIG. 4B. In addition, when an operator input to the second input unit 430 or the third input unit 440 is obtained, a list of conflict information corresponding to the operator input can be provided to the operator through the operator terminal, and a detailed description of this is shown in Figure 2. This is described later in 4c.

The first subpage 40b shown in FIG. 4B may be provided to the worker terminal in response to an operator input to the icon 425 on the first page 40a for providing code conflict information according to the first function. . The first subpage 40b may include code conflict detailed information 450, and the code conflict detailed information 450 may include information on the code portion in which the conflict occurred. Specifically, information on the code portion in which a conflict occurred in the program code related to the first branch may be provided, and the code portion information may be highlighted. In some embodiments, the code conflict details 450 may include code line information before the modification operation and code line information after the modification operation.

Figure 4c shows a first page 40c including a conflict information list corresponding to the worker identification information 460 provided to the worker terminal when the worker identification information 460 is acquired through the second input unit 430. do. The conflict information list corresponding to the worker identification information 460 may include code conflict information related to the work in which the worker participated. Specifically, the conflict information list corresponding to the worker identification information 460 includes branch information 470 in which the conflict occurred as a result of the worker performing the task, tag information 480 corresponding to the first branch information, and file information in which the conflict occurred. It may include at least some of (490). Worker identification information 460 may be the worker's email address or the worker's unique ID. Additionally, although not shown, when branch identification information is obtained through the third input unit 440, a first page including a conflict information list corresponding to the branch identification information may be provided to the worker terminal.

5A and 5B are diagrams showing a page providing code information according to a second function according to an embodiment of the present disclosure. In an embodiment, the second function may be a function for providing information on a worker who performed work on a file related to a conflict that arises for a merge combination.

A second page 50a for providing code conflict information according to the second function shown in FIG. 5A may be provided in response to an operator's input on the second tab 500 corresponding to the second function. Referring to FIG. 5A, the second page 50a may include a conflict information list 510 for each file, and the conflict information list 510 for each worker may include file information 511 in which a conflict occurred, and edit information for the file. At least some of the following: worker information 512 who performed the work, commit information 513 obtained in relation to work on the file, branch information 515 corresponding to the file, and tag information 516 corresponding to the branch information. may include.

Meanwhile, in the embodiment, the second tab 500 has been described as showing a list of files in which conflicts have occurred, but this is not limited, and all edited user information for each file in the project can be checked. For example, information about all files in a project can be displayed, users with a history of editing the files can be identified, and project management can be easily performed based on this information.

Additionally, the conflict information list 510 for each file may include an icon 514 to provide detailed information about the conflict situation. When a worker input for the icon 514 is obtained, the electronic device 110 can provide detailed information about the conflict situation to the worker through the worker terminal, a detailed description of which will be described later in FIG. 5B. Meanwhile, although not shown, in some embodiments, the file-specific conflict information list 510 provided to the worker terminal according to the second function performs work on files in which conflicts occur within a specified period in response to the worker's period information input. Can contain one worker information.

The second subpage 50b shown in FIG. 5B may be provided to the worker terminal in response to an operator input to the icon 514 on the second page 50a for providing code conflict information according to the second function. . The second subpage 50b may include code conflict details 520 and 530, and the code conflict details 520 and 530 may include information on the code portion in which the conflict occurred. Specifically, information on the code part where the conflict occurred may be provided, and the code part information may be highlighted. In some embodiments, code conflict details 520 and 530 may include at least some of change information and comparison information for program code.

FIG. 6 is a diagram illustrating a page that provides code information according to a third function according to an embodiment of the present disclosure. In an embodiment, the third function may be a function for providing branch information related to a specific branch.

A third page 60 for providing code conflict information according to the third function shown in FIG. 6 may be provided in response to an operator's input on the third tab 600 corresponding to the third function. Referring to FIG. 6, the third page 60 may include a conflict information list 610 including a plurality of branch information related to the first branch. Each of the plurality of branch information included in the conflict information list 610 may include branch path information. The branch path information may indicate which master branch (MB) the corresponding branch is derived from, and in some embodiments, the conflict information list 610 contains at least some of the information about a plurality of branches branched from the corresponding master branch (MB). It can be included.

Code conflict information provided according to the third function may be indirect information for the operator to determine the conflict. Specifically, the rule is that when work on a specific branch is completed, the existing branch is deleted, but if deletion is not performed, the worker must determine whether the conflict caused by the undeleted branch is a conflict that can be ignored, or whether it is a conflict that requires attention. Whether there is a conflict can be determined based on code conflict information provided according to the third function. Additionally, based on code conflict information provided according to the third function, workers can set a branch combination to perform conflict testing. Specifically, the operator can set to exclude branches on which a deletion operation has not been performed from the conflict test performance target based on code conflict information provided according to the third function.

Meanwhile, in the embodiment, in the case of branches for which a conflict has been confirmed, confirmation can be requested from the corresponding worker, and a link through which conflict information can be confirmed on the page according to the embodiment of the present specification can be provided to each worker. Additionally, in an embodiment, conflict determination is performed by comparing files in the corresponding branch with each other, so it is necessary to check the conflict of other files that are logically related to a specific file. In this case, by user settings, it is possible to periodically check whether a conflict has occurred in files other than the same file, and conflict information can also be provided to each worker. Meanwhile, according to an embodiment of the present disclosure, when a conflict between codes is detected, alarm information related to the occurrence of a conflict may be provided to the worker through a cloud-based work program for performing coding work related to the project, and the conflict may occur. Alarm information related to may include instruction information instructing to check the detected code conflict information.

FIG. 7 is a diagram illustrating an electronic device 110 for providing code information according to an embodiment of the present disclosure. Referring to FIG. 7 , the electronic device 110 according to an embodiment of the present disclosure may include a transceiver 710, a processor 720, and a memory 730.

The electronic device 110 can be connected to an external terminal through the transceiver 710 and exchange data. As an example, the electronic device 110 may be connected to the first to nth worker terminals 120_1, 120_2, ..., 120_n, respectively, through the transceiver 710.

The processor 720 may include at least one device described above with reference to FIGS. 1 to 6 or may store information for performing at least one method described with reference to FIGS. 1 to 6 . Additionally, the processor 720 can control the electronic device 110 to execute programs and provide code information.

The memory 730 may include at least one of volatile memory and non-volatile memory. Additionally, the memory 730 may store the code of a program executed by the processor 720. Meanwhile, although not shown, an interface for providing information from the electronic device 110 to an external terminal may be further included.

The above-described contents are specific embodiments for carrying out the present disclosure. The present disclosure will include not only the above-described embodiments, but also embodiments that are simply designed or can be easily changed. Additionally, the present disclosure will also include technologies that can be easily modified and implemented using the above-described embodiments. Therefore, the scope of the present disclosure should not be limited to the above-described embodiments, but should be determined by the claims and equivalents of the present disclosure as well as the claims described later.

Claims

In a method of providing code information by an electronic device,

Obtaining project information from at least one worker terminal;

Obtaining at least two branch information corresponding to the project information from the at least one worker terminal;

Confirming a merge combination based on the combination of the at least two branch information for a conflict test; and

A method of providing code information comprising providing code conflict information to the at least one worker terminal based on a result of performing the conflict test on the merge combination.
According to claim 1,

The code conflict information includes a first conflict information list that occurred for the merge combination,

The conflict information list includes at least part of branch information where a conflict has occurred with respect to the merge combination, file information related to the conflict, and tag information corresponding to the branch information.
According to clause 2,

When a first worker input corresponding to the first conflict information list is obtained, a code further comprising providing information on a code part in which a conflict occurs with respect to file information corresponding to the first worker input to the first worker terminal. How to provide information.
According to claim 1,

Obtaining worker identification information from the at least one worker terminal; and

Code information providing method further comprising providing a second conflict information list corresponding to the worker identification information to the at least one worker terminal.
According to claim 1,

Obtaining branch identification information from the at least one worker terminal; and

A method of providing code information further comprising providing a third conflict information list corresponding to the branch identification information to the at least one worker terminal.
According to claim 1,

The code conflict information includes a list of worker information that performed work on the same file,

The worker information list includes at least part of branch information corresponding to the file, tag information corresponding to the branch information, and commit information corresponding to the file.
According to clause 6,

When a second worker input corresponding to the first worker information list is obtained, a code information providing method for providing code change information for file information corresponding to the second worker input to a second worker terminal.
According to claim 1,

A method of providing code information wherein the code conflict information includes a branch information list derived from master branch information.
According to claim 1,

The step of checking a merge combination related to the project information for the conflict test is performed when commit information related to at least some of the at least two branch information is obtained.
According to claim 1,

The step of checking a merge combination related to the project information for the conflict test is performed according to a cycle set by an administrator of the electronic device.
According to claim 1,

The merge combination includes at least some of a merge combination between the at least two branch information, a merge combination between the at least two pieces of file information related to the first branch information, and a merge combination for the program code included in the first file information. How to provide code information, including:
A computer program coupled with hardware and stored on a computer-readable storage medium for managing images related to item details, comprising:

Obtain project information from at least one worker terminal,

Obtain at least two branch information corresponding to the project information from the at least one worker terminal,

For a conflict test, the merge combination is confirmed based on the combination of the at least two branch information,

A computer program that provides code conflict information to the at least one worker terminal based on a result of performing the conflict test on the merge combination.
An electronic device that provides code information, comprising:

Includes a transceiver, memory for storing instructions, and a processor;

The processor connected to the transceiver and the memory,

Obtain project information from at least one worker terminal,

Obtain at least two branch information corresponding to the project information from the at least one worker terminal,

For a conflict test, the merge combination is confirmed based on the combination of the at least two branch information,

An electronic device that provides code conflict information to the at least one worker terminal based on a result of performing the conflict test on the merge combination.