Version control system tools empower developers to independently work on their development tasks. These tools also facilitate the integration of changes through merging operations, and report textual conflicts. However, when developers integrate their changes, they might encounter other types of conflicts that are not detected by current merge tools. In this paper, we focus on dynamic semantic conflicts, which occur when merging reports no textual conflicts but results in undesired interference - causing unexpected program behavior at runtime. To address this issue, we propose a technique that explores the use of static analysis to detect interference when merging contributions from two developers. We evaluate our technique using a dataset ...
Transaction programs are comprised of read and write operations issued against the database. In a ...
Nowadays, nearly all software systems are developed by programmers working in a collaborative softwa...
Aspects have been successfully promoted as a means to improve the modularization of software in the ...
Branching and merging are common practices in collaborative software development. They increase deve...
Tese de mestrado, Engenharia Informática (Engenharia de Software),Universidade de Lisboa, Faculdade ...
International audienceIn software development, version control systems (VCS) provide branching and m...
FACEPEEmpirical studies show that collaboration conflicts frequently occur, impairing developers’ pr...
The concurrent development of applications requires reconciling conflicting code updates by differen...
The concurrent development of applications requires reconciling conflicting code updates by differen...
The concurrent development of applications requires reconciling conflicting code updates by differen...
Concurrent contributions to a code base may introduce merge conflicts. Whereas merge conflicts are e...
Specifying software requirements is an important, complicated and error prone task. It involves the ...
Software branching and merging allows collaborative development and creating software variants, comm...
Collaborative software development is an integral part of the modern software development life cycle...
Revision control mechanisms are a crucial part of information systems to keep track of changes. It i...
Transaction programs are comprised of read and write operations issued against the database. In a ...
Nowadays, nearly all software systems are developed by programmers working in a collaborative softwa...
Aspects have been successfully promoted as a means to improve the modularization of software in the ...
Branching and merging are common practices in collaborative software development. They increase deve...
Tese de mestrado, Engenharia Informática (Engenharia de Software),Universidade de Lisboa, Faculdade ...
International audienceIn software development, version control systems (VCS) provide branching and m...
FACEPEEmpirical studies show that collaboration conflicts frequently occur, impairing developers’ pr...
The concurrent development of applications requires reconciling conflicting code updates by differen...
The concurrent development of applications requires reconciling conflicting code updates by differen...
The concurrent development of applications requires reconciling conflicting code updates by differen...
Concurrent contributions to a code base may introduce merge conflicts. Whereas merge conflicts are e...
Specifying software requirements is an important, complicated and error prone task. It involves the ...
Software branching and merging allows collaborative development and creating software variants, comm...
Collaborative software development is an integral part of the modern software development life cycle...
Revision control mechanisms are a crucial part of information systems to keep track of changes. It i...
Transaction programs are comprised of read and write operations issued against the database. In a ...
Nowadays, nearly all software systems are developed by programmers working in a collaborative softwa...
Aspects have been successfully promoted as a means to improve the modularization of software in the ...