Abstract: A method for merging a plurality of software code change versions, where a merging apparatus may first analyze code change areas in a software code preliminarily merged version and two different software code change versions. After change intents of the two code change areas are determined, the merging apparatus eliminates, based on a conflict elimination rule set and the change intents of the two code change areas, a conflict block in the software code preliminarily merged version.

Abstract: A local apparatus is configured to perform resolution on a conflict field generated by code files of a plurality of versions, and send a conflict resolution result to the service apparatus. The conflict field includes at least one conflict block, and the conflict resolution result includes at least one of a resolution result of a local resolvable conflict block and an identifier of a local irresolvable conflict block. The remote apparatus is configured to obtain the conflict resolution result from the service apparatus, generate a collaborative processing window based on the conflict resolution result, and receive a result of processing the conflict resolution result by a remote user based on the collaborative processing window.

Abstract: In a code processing method, a computing device determines a source branch and a target branch of a software development project, where the source branch includes a plurality of commit codes, and the plurality of commit codes include a first commit code and a second commit code. The computing device presents the first commit code and the second commit code associated with the first commit code to a user, and performs code merging on the first commit code, some or all of second commit codes, and a commit code in the target branch according to user input.

Abstract: A universal transmission roller wheel comprises a 90° roller support and a 45° roller support. There is a drive axle hole in the center of each support. The 90° roller support and the 45° roller support are integrated in parallel. 90° rollers are mounted on first supporting shafts fixed around on the 90° roller support with regular intervals, the axis of each 90° roller is at a spatial angle of 90° with the axis of the drive axle bore, 45° rollers are mounted on second supporting shafts fixed around on the 45° roller support with regular intervals, the axis of each 45° roller is at a spatial angle of 45° with the axis of the drive axle bore in the same inclining orientation.

Abstract: A universal transmission roller wheel comprises a 90° roller support and a 45° roller support. There is a drive axle hole in the center of each support. The 90° roller support and the 45° roller support are integrated in parallel. 90° rollers are mounted on first supporting shafts fixed around on the 90° roller support with regular intervals, the axis of each 90° roller is at a spatial angle of 90° with the axis of the drive axle bore, 45° rollers are mounted on second supporting shafts fixed around on the 45° roller support with regular intervals, the axis of each 45° roller is at a spatial angle of 45° with the axis of the drive axle bore in the same inclining orientation.