engleski

Code merging analysis for different procedure types

This paper presents the results of a research on code merging in a specific development environment. The research data was collected during a timeframe of 5 years of software development and maintenance. Four different software products were monitored. During that time 49.572 procedure mergings occurred and 498 of them were recognized as conflicts. A merge conflict occurs when two programmers make changes at the same time on the same source code block (procedure or program module, for example) and then try to merge their changes into a central server repository. In this paper merge conflicts, source code merging and their relationship with procedure types were analyzed. The collected data is organized according to the procedure type. The research goal was to establish if there is a connection between merge conflicts and procedure types and to analyze the differences in code merging for different procedure types.

Merge conflict; procedure type; team of programmers; team software development.

nije evidentirano