CoChat

Improving early detection of software merge conflicts

Guimarães, Mário Luís, Silva, António Rito · 2012 · 2012 34th International Conference on Software Engineering (ICSE)
Cited by 56

The DOI matches its Crossref record; 1 of the 1 references it cites were found in a registry or an index.

Abstract

Merge conflicts cause software defects which if detected late may require expensive resolution. This is especially true when developers work too long without integrating concurrent changes, which in practice is common as integration generally occurs at check-in. Awareness of others' activities was proposed to help developers detect conflicts earlier. However, it requires developers to detect conflicts by themselves and may overload them with notifications, thus making detection harder. This paper presents a novel solution that continuously merges uncommitted and committed changes to create a background system that is analyzed, compiled, and tested to precisely and accurately detect conflicts on behalf of developers, before check-in. An empirical study confirms that our solution avoids overloading developers and improves early detection of conflicts over existing approaches. Similarly to what happened with continuous compilation, this introduces the case for continuous merging inside the IDE.

Overview

The claims and statistics of this paper haven’t been checked yet.

Free: it reads the open-access text and checks the first 5 claims that cite a source we can check. Create a free account to check every claim.

A few free checks a day · papers already verified open instantly · results are public

Integrity signals

Registry

Crossref · 10.1109/icse.2012.6227180

Cites

1 of 1 references verified0 citation errors · 0 not checkable

Statistics

Verification

Claims the paper makes

The claims and statistics of this paper haven’t been checked yet.

Free: it reads the open-access text and checks the first 5 claims that cite a source we can check. Create a free account to check every claim.

A few free checks a day · papers already verified open instantly · results are public

Self-check

Percentages, sums and reported differences re-computed from the paper’s own numbers.

The self-check needs the paper’s full text.

Citations

Cites

Research works printed but not linked: 22

  1. Berczuk, 2002, Software Configuration Management Patterns: Effective Teamwork, Practical Integration
  2. Fowler, Continuous Integration
  3. 10.1145/383876.383878 · DOI · Paper page
  4. 10.1145/2025113.2025139 · DOI · Paper page
  5. Duvall, 2007, Continuous Integration: Improving Software Quality and Reducing Risk
  6. 10.1145/224019.224036 · DOI
  7. 10.1145/958160.958177 · DOI · Paper page
  8. 10.1109/ICGSE.2007.13 · DOI · Paper page
  9. 10.1145/289444.289502 · DOI · Paper page
  10. 10.1145/1984642.1984662 · DOI
  11. 10.1145/1833310.1833320 · DOI
  12. 10.1007/0-306-48019-0_5 · DOI
  13. 10.1007/978-1-84800-031-5_9 · DOI
  14. 10.1145/1321631.1321647 · DOI
  15. 10.1145/1240624.1240823 · DOI · Paper page
  16. 10.1145/192844.193016 · DOI
  17. 10.1023/A:1026586415054 · DOI · Paper page
  18. 10.1145/1180875.1180884 · DOI
  19. 10.1145/1031607.1031611 · doi:10.1145/1031607.1031611
  20. 10.1145/1454247.1454255 · DOI
  21. 10.1145/1806799.1806867 · DOI
  22. 10.1145/1453101.1453118 · DOI

Cited by

See all 56

Metadata

Authors
Guimarães, M. L., & Silva, A. R.
Venue
2012 34th International Conference on Software Engineering (ICSE)
Publisher
IEEE
Published
2012-06
Pages
342-352
ISSN
0270-5257 (ISSN-L)
OpenAlex
W3146893295
Cited by
56
References
1
FWCI
2.78
Type
conference paper
Language
en
Open access
closed

About these checks

Registry, retraction, Cites and statistics results are computed, not judged, with one exception: a printed reference that no index lists is read once by a model before it counts as a citation error. Claims are extracted by a model and kept only when their quote appears verbatim in the text; each cited source is then checked, with a model’s help, for whether it says what the claim relies on. Those verdicts can be wrong — read the claim’s quote and the cited source before relying on one.

Statistics and arithmetic are recomputed, not judged.

Confidence bands are shown only for fields calibrated on our annotated test set. None is calibrated yet, so no band is shown.

What counts as a claim ›How we measure confidence ›How we check this ›

Are you an author, or do you see a problem with this page? Request a review

Data sources

Bibliographic data: Semantic Scholar, OpenAlex, Crossref.

Contains information from the Semantic Scholar Academic Graph Datasets, made available under the ODC Attribution License (ODC-BY 1.0).

Semantic Scholar’s data is described in: Kinney, R., et al. (2023). The Semantic Scholar Open Data Platform. arXiv:2301.10140.