Construct · 1 fields · 1 citations

merge conflicts: a standalone construct

One name. One construct. A landmark on the map.

● anchor · a standalone construct Nearest construct by meaning·not indexed

A single standalone construct; nearby constructs are located against it in the Collider. Tap a field for its definition, unit, and measures.

Software engineering

conflicts that arise when parallel changes to the same code are combined, characterized by size, kind and how developers resolve them.

In software engineering, merge conflicts refers to conflicts that arise when parallel changes to the same code are combined, characterized by size, kind and how developers resolve them. This meaning comes from Ghiotto (2020) in IEEE Transactions on Software Engineering.[1]

Unit
Recovery means
Measured by

Run it through the Collider, or take the citations with you.

See how merge conflicts sits against neighbouring constructs in the Collider, or export every reference on this page in one click.

Open in Collider Export BibTeX Report this entry

Nearby constructs

code3 fields · 6 citationsjingle · one word, three constructs merge3 fields · 5 citationsjingle · one word, three constructs parallel1 fields · 1 citationsanchor · a standalone construct

References

Ghiotto, G., Murta, L., Barros, M., & van der Hoek, A. (2020). On the Nature of Merge Conflicts: A Study of 2,731 Open Source Java Projects Hosted by GitHub. IEEE Transactions on Software Engineering, 46(8), 892-915. https://doi.org/10.1109/tse.2018.2871083

Cited on this page?

Confirm your construct, or correct us.

If your work is cited behind one of these entries, you know better than we do whether we captured the meaning right. Confirm it, suggest an edit, or dispute it, and your name goes on the entry as an author who has checked it, linked to your ORCID.

Claim your construct