A formal investigation of Diff3

Khanna, S., Kunal, K., & Pierce, B. C. (2007). A formal investigation of Diff3. FSTTCS 2007: Foundations of Software Technology and Theoretical Computer Science.

Type

Book chapter

Intellectual base

Review or monograph

Year

2007

DOI

10.1007/978-3-540-77050-3_40

ISBN

9783540770497

Link

https://doi.org/10.1007/978-3-540-77050-3_40

Cited from

information_theory

Cited by

1 citation across 1 artifact.

Primes

• Branching and Merging
  • It separates the work of changing from the work of agreeing: parallel lines change freely in isolation, and a discrete merge operation later does the agreeing all at once, including the explicit detection and resolution of the conflicts that accumulated while the lines were apart.

Verification

This reference passed the adversarial substantiation pipeline: it was checked to exist and to support the claim it is attached to. See how references were verified.

Registry ID ref:b4a8434c401b · see in the full table