engleski

Analysis of the Relationship between Merge Conflicts and Procedure Types

This paper presents the results of a research on team software development in a specific development environment in which a set of development tools are used: C, Clarion code generator, Pl/Sql and various products such as a database synchronization tool (“Synchro”), Oracle and Clarion drivers (modified to meet specific company needs), a configuration management tool (“Builder”) and a thin client solution (“Thin@”). The research data was collected based on activities of a team of developers during a timeframe of 5 years of software development and maintenance. This research analyses merge conflicts and source code mergings and their relationship with procedure types. 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. 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.

team of programmers; merge conflict; team software development; procedure; procedure type

nije evidentirano