Glossary: System Design Beyond the Basics in Rust

Merge

Combining conflicting versions instead of dropping one, for example taking the union of two carts.