Improving early detection of software merge conflicts

Guimaraes,; Silva, S. Ravi P.

doi:10.1109/icse.2012.6227180

Cited by 66 publications

(55 citation statements)

References 20 publications

Supporting

Mentioning

Contrasting

Order By: Relevance

“…Wecode [35] used continuous integration for conflict detection which runs as plug-in of Eclipse. Wecode address direct and indirect conflicts.…”

Section: Related Workmentioning

confidence: 99%

“…Being aware of others work enables the developers to detect the conflicts at early stage before they diffuse with the main repository. SCM community has accepted it as challenge and realized the benefits of workspace awareness tools [22][23][24][25][26][27][28][29][30].Significant contributions have been done by [31,23,22,34,26] in workspace awareness which assist the developers to detect conflicts early by exchanging information among developers. These tools compliment SCM by coordinating across workspaces still maintaining good isolation.…”

Section: Introductionmentioning

confidence: 99%

See 1 more Smart Citation

Advance Version Control (AVC): A Paradigm Shift from Version Control to Conflict Management

Kaur¹,

Singh²

2017

IJCA

View full text Add to dashboard Cite

Distance is the major barrier in Global software development. It negatively impacts communication and coordination. Many tools are used to help developers to coordinate their work. One such tool is Software Configuration Management (SCM). But studies have shown that SCM lacks in conflict detection. This weakness has been removed by workspace awareness tool.This paper describes Advance Version Control tool (AVC), a tool that does versioning of artifacts and actively monitor commit activities of the developer. It is an integration of Configuration Management and Conflict Management. AVC determines conflicts at right time and also provides resolution methods like code sharing. The developed tool allows the developers to focus on their main task i.e. programming without presenting trivial notifications and warnings. AVC also has integrated communication medium to further enhance the coordination. General TermsDistributed Software Development, Software Configuration Management, Workspace Management tools.

show abstract

“…Wecode [35] used continuous integration for conflict detection which runs as plug-in of Eclipse. Wecode address direct and indirect conflicts.…”

Section: Related Workmentioning

confidence: 99%

Section: Introductionmentioning

confidence: 99%

Advance Version Control (AVC): A Paradigm Shift from Version Control to Conflict Management

Kaur¹,

Singh²

2017

IJCA

View full text Add to dashboard Cite

show abstract

“…(The average project size was 11'776 lines of code in 68 classes). [19] detect, inspect no no real-time no yes no no no CollabVS [16] detect detect, inspect yes real-time yes yes no no no Crystal [4] detect detect no commit no no yes no no WeCode [15] detect detect no saving no no yes no no CloudStudio [10] prevent, detect, inspect detect, inspect no real-time yes yes yes no yes Collabode [14] no no -no no no no yes no Cloud9 [6] no no -no no no no yes no whether it supports detection of direct conflicts and of indirect conflicts (cf. [26]); whether conflict reports may include false positives; whether conflicts are available in real-time or upon commit; the granularity of the awareness system (line, class, or branch); whether collaborative editing supports shared sessions a la Google Doc and automatic merging of versions.…”

Section: Design Of the Empirical Studymentioning

confidence: 99%

Awareness and Merge Conflicts in Distributed Software Development

Estler

Nordio

Furia

et al. 2014

2014 IEEE 9th International Conference on Global Software Engineering

View full text Add to dashboard Cite

Abstract-Collaborative software development requires programmers to coordinate their work and merge individual contributions into a consistent shared code base. Traditionally, coordination follows a series of "update-modify-commit" cycles, where merge conflicts arise upon committing if individual modifications have diverged and must be explicitly reconciled. Researchers have been suggesting that providing timely awareness information about "who's changing what" may not only help deal with conflicts but, more generally, improve the effectiveness of collaboration.This paper investigates the impact of awareness information in the context of globally distributed software development. Based on an analysis of data from 105 student developers constituting 12 development teams located in different countries, we analyze, among other things: 1) the frequency of merge conflicts and insufficient awareness; 2) the impact of distribution on team awareness; 3) the perceived impact of conflicts and lack of awareness on productivity, motivation, and project punctuality. Our findings include: 1) lack of awareness occurs more frequently than merge conflicts; 2) information about remote team members is missing roughly as often as information about co-located ones; 3) insufficient awareness information affects more negatively programmer's performance than merge conflicts.

show abstract

“…To reduce false positives, Syde [6] uses a fine-grained change tracking mechanism in which objectoriented systems are modeled as abstract syntax trees, and changes are tree operations. Similarly to Crystal, WeCode [8] computes the presence of merge conflicts, but by continuously integrating the changes in the workspaces of workers into a merge workspace shared among the workers. Regarding UML diagrams or documents, ADAMS [9] is a web-based system that provides a fine-grained artifact management approach and uses traceability information to propagate the change events to the related artifacts.…”

Section: Related Workmentioning

confidence: 99%

An Inconsistency Management Support System for Collaborative Software Development

Huyen

Ochimizu

2014

IEICE Trans. Inf. & Syst.

View full text Add to dashboard Cite

SUMMARYIn collaborative software developments, many change processes implementing change requests are executed concurrently by different workers. The fact that the workers do not have sufficient information about the others' work and complicated dependencies among artifacts can lead to unexpected inconsistencies among the artifacts impacted by the changes. Most previous studies concentrated only on concurrent changes and considered them separately. However, even when the changes are not concurrent, inconsistencies may still happen if a worker does not recognize the impact of the changes made by other workers on his changes or the impact of his changes on other workers' changes. In addition, the changes in a change process are related to each other through their common target of realizing the change request and the dependencies among the changed artifacts. Therefore, to handle inconsistencies more effectively, we concentrate on both concurrent and non-concurrent changes, and the context of a change, i.e. the change process containing the change, rather than the ongoing changes only. In this paper, we present an inconsistency awareness mechanism and a Change Support Workflow Management System (CSWMS) that realizes this mechanism. By monitoring the progress of the change processes and the ongoing changes in the client workspaces, CSWMS can notify the workers of a (potential) inconsistency in advance along with the context of the inconsistency, that is, the changes causing the inconsistency and the change processes containing these changes. Based on the information provided by CSWMS, the workers can detect and resolve inconsistencies more easily and quickly. Therefore, our research can contribute to building a safer and more efficient collaborative software development environment. key words: inconsistency awareness, context awareness, patterns of inconsistency, change process, collaborative software development

show abstract

Improving early detection of software merge conflicts

Cited by 66 publications

References 20 publications

Advance Version Control (AVC): A Paradigm Shift from Version Control to Conflict Management

Advance Version Control (AVC): A Paradigm Shift from Version Control to Conflict Management

Awareness and Merge Conflicts in Distributed Software Development

An Inconsistency Management Support System for Collaborative Software Development

Contact Info

Product

Resources

About