1# A conflict version merged
2
3`candidate` is `a_version_of_a_onenote_file_merges_into_it` in `crates/notebook/tests/cloud.rs`
4(`ONESTORE_ICLOUD_EXPORT`): two devices edit `conflict-page/native/initial` through a fake
5iCloud Drive. The Mac types "Mac: " at the start of the first paragraph; the iPhone, offline,
6types "iPhone: " at the same place, appends to the positioned outline and adds a page "From the
7iPhone" with a body. The iPhone's upload becomes a conflict version, which the Mac merges: the
8appended text and the new page replay, and the clashing edit becomes a conflict page.
9
10`cold` is OneNote 2010's fresh read in a disposable clone (`tools/native_runner.py`,
11`--screenshots`): both pages list, the first with its conflict mark and the yellow bar "This page
12has changes that could not be merged during synchronization", its positioned outline ending
13"(typed on the iPhone)", and "From the iPhone" holding "Written offline on the iPhone."
14
15`first-edit-checkpoints` holds the two copies of `apart` in `crates/notebook/tests/cloud.rs`
16(a fresh Snowbound section of four pages; the Mac types in the first page's title, the iPhone
17writes on the first two pages, moves the fourth first and deletes the third) as the writer
18before #152 stored them: each page's first edit a checkpoint with no dependency, so the first
19page's two copies share no revision. Merged either way round, that page stays the file's with
20the other copy as its conflict page, and the rest merges
21(`pages_first_edited_before_152_merge_as_conflict_pages`).