Rebuilt documentation after adding salvaging.

Sources/Forked/Mergeable.swift

@@ -21,6 +21,7 @@ public protocol Mergeable: Equatable {
     /// start them syncing again, the history relating them is lost, and there is no common
     /// ancestor. You can choose one or the other, but just blindly merging the two will
     /// lead to duplications (how often have we seen that in apps like Contacts?)
+    /// 
     /// That's a lot of introduction, but it sets up this function. This function is effectively
     /// a 2-way merge. By default, it just returns `self`, which is considered the dominant
     /// copy of the data. But if you need special handling to bootstrap, you can "salvage"

docs/Forked/assets.json

@@ -1 +1 @@
-{"downloads":[],"images":[{"variants":[{"url":"\/images\/Forked\/ForkedHub.png","traits":["1x","light"]}],"identifier":"ForkedHub","type":"image","alt":"The hub-and-spoke architecture of Forked."}],"videos":[]}
+{"images":[{"variants":[{"url":"\/images\/Forked\/ForkedHub.png","traits":["1x","light"]}],"identifier":"ForkedHub","alt":"The hub-and-spoke architecture of Forked.","type":"image"}],"downloads":[],"videos":[]}

docs/Forked/data/documentation/forked/atomicrepository/content(of:at:).json

@@ -1 +1 @@
-{"sections":[],"identifier":{"url":"doc:\/\/Forked\/documentation\/Forked\/AtomicRepository\/content(of:at:)","interfaceLanguage":"swift"},"variants":[{"traits":[{"interfaceLanguage":"swift"}],"paths":["\/documentation\/forked\/atomicrepository\/content(of:at:)"]}],"primaryContentSections":[{"declarations":[{"tokens":[{"text":"func","kind":"keyword"},{"text":" ","kind":"text"},{"text":"content","kind":"identifier"},{"text":"(","kind":"text"},{"kind":"externalParam","text":"of"},{"text":" ","kind":"text"},{"text":"fork","kind":"internalParam"},{"kind":"text","text":": "},{"text":"Fork","identifier":"doc:\/\/Forked\/documentation\/Forked\/Fork","kind":"typeIdentifier","preciseIdentifier":"s:6Forked4ForkV"},{"text":", ","kind":"text"},{"kind":"externalParam","text":"at"},{"text":" ","kind":"text"},{"kind":"internalParam","text":"version"},{"kind":"text","text":": "},{"text":"Version","identifier":"doc:\/\/Forked\/documentation\/Forked\/Version","kind":"typeIdentifier","preciseIdentifier":"s:6Forked7VersionV"},{"kind":"text","text":") "},{"text":"throws","kind":"keyword"},{"text":" -> ","kind":"text"},{"text":"CommitContent","kind":"typeIdentifier","identifier":"doc:\/\/Forked\/documentation\/Forked\/CommitContent","preciseIdentifier":"s:6Forked13CommitContentO"},{"text":"<","kind":"text"},{"text":"Resource","kind":"typeIdentifier"},{"kind":"text","text":">"}],"languages":["swift"],"platforms":["macOS"]}],"kind":"declarations"}],"hierarchy":{"paths":[["doc:\/\/Forked\/documentation\/Forked","doc:\/\/Forked\/documentation\/Forked\/AtomicRepository"]]},"metadata":{"modules":[{"name":"Forked"}],"title":"content(of:at:)","fragments":[{"text":"func","kind":"keyword"},{"kind":"text","text":" "},{"text":"content","kind":"identifier"},{"kind":"text","text":"("},{"text":"of","kind":"externalParam"},{"text":": ","kind":"text"},{"text":"Fork","kind":"typeIdentifier","preciseIdentifier":"s:6Forked4ForkV"},{"kind":"text","text":", "},{"kind":"externalParam","text":"at"},{"kind":"text","text":": "},{"text":"Version","preciseIdentifier":"s:6Forked7VersionV","kind":"typeIdentifier"},{"text":") ","kind":"text"},{"text":"throws","kind":"keyword"},{"kind":"text","text":" -> "},{"text":"CommitContent","kind":"typeIdentifier","preciseIdentifier":"s:6Forked13CommitContentO"},{"text":"<","kind":"text"},{"kind":"typeIdentifier","text":"Resource"},{"text":">","kind":"text"}],"role":"symbol","symbolKind":"method","externalID":"s:6Forked16AtomicRepositoryC7content2of2atAA13CommitContentOyxGAA4ForkV_AA7VersionVtKF","roleHeading":"Instance Method"},"schemaVersion":{"minor":3,"patch":0,"major":0},"kind":"symbol","references":{"doc://Forked/documentation/Forked/Fork":{"role":"symbol","fragments":[{"kind":"keyword","text":"struct"},{"text":" ","kind":"text"},{"text":"Fork","kind":"identifier"}],"title":"Fork","abstract":[{"text":"A type representing a named fork.","type":"text"}],"kind":"symbol","identifier":"doc:\/\/Forked\/documentation\/Forked\/Fork","type":"topic","url":"\/documentation\/forked\/fork","navigatorTitle":[{"text":"Fork","kind":"identifier"}]},"doc://Forked/documentation/Forked/AtomicRepository":{"kind":"symbol","type":"topic","role":"symbol","abstract":[{"text":"An atomic repository is one that gets loaded completely into memory.","type":"text"},{"type":"text","text":" "},{"type":"text","text":"If the "},{"code":"Resource","type":"codeVoice"},{"text":" it contains conforms to ","type":"text"},{"type":"codeVoice","code":"Codable"},{"text":", the ","type":"text"},{"code":"AtomicRepository","type":"codeVoice"},{"text":" is","type":"text"},{"text":" ","type":"text"},{"text":"also ","type":"text"},{"code":"Codable","type":"codeVoice"},{"type":"text","text":", and can be converted to a serialized form and saved as a file."},{"text":" ","type":"text"},{"type":"text","text":"Saving and loading are atomic, that is, the whole repository is loaded from file, and the whole"},{"text":" ","type":"text"},{"type":"text","text":"file is written to disk."}],"navigatorTitle":[{"text":"AtomicRepository","kind":"identifier"}],"title":"AtomicRepository","url":"\/documentation\/forked\/atomicrepository","fragments":[{"kind":"keyword","text":"class"},{"text":" ","kind":"text"},{"kind":"identifier","text":"AtomicRepository"}],"identifier":"doc:\/\/Forked\/documentation\/Forked\/AtomicRepository"},"doc://Forked/documentation/Forked/CommitContent":{"title":"CommitContent","url":"\/documentation\/forked\/commitcontent","fragments":[{"kind":"keyword","text":"enum"},{"text":" ","kind":"text"},{"text":"CommitContent","kind":"identifier"}],"navigatorTitle":[{"kind":"identifier","text":"CommitContent"}],"type":"topic","role":"symbol","abstract":[{"text":"A wrapper to hold the resource. This allows for the resource to be","type":"text"},{"text":" ","type":"text"},{"type":"text","text":"absent in a fork, similar to using "},{"code":"nil","type":"codeVoice"},{"type":"text","text":"."}],"kind":"symbol","identifier":"doc:\/\/Forked\/documentation\/Forked\/CommitContent"},"doc://Forked/documentation/Forked/AtomicRepository/content(of:at:)":{"url":"\/documentation\/forked\/atomicrepository\/content(of:at:)","fragments":[{"text":"func","kind":"keyword"},{"text":" ","kind":"text"},{"kind":"identifier","text":"content"},{"text":"(","kind":"text"},{"text":"of","kind":"externalParam"},{"text":": ","kind":"text"},{"text":"Fork","preciseIdentifier":"s:6Forked4ForkV","kind":"typeIdentifier"},{"kind":"text","text":", "},{"text":"at","kind":"externalParam"},{"text":": ","kind":"text"},{"text":"Version","kind":"typeIdentifier","preciseIdentifier":"s:6Forked7VersionV"},{"text":") ","kind":"text"},{"kind":"keyword","text":"throws"},{"text":" -> ","kind":"text"},{"preciseIdentifier":"s:6Forked13CommitContentO","kind":"typeIdentifier","text":"CommitContent"},{"kind":"text","text":"<"},{"text":"Resource","kind":"typeIdentifier"},{"kind":"text","text":">"}],"kind":"symbol","role":"symbol","identifier":"doc:\/\/Forked\/documentation\/Forked\/AtomicRepository\/content(of:at:)","title":"content(of:at:)","abstract":[],"type":"topic"},"doc://Forked/documentation/Forked":{"identifier":"doc:\/\/Forked\/documentation\/Forked","title":"Forked","type":"topic","role":"collection","abstract":[{"text":"A framework for handling shared data with confidence in Swift.","type":"text"}],"url":"\/documentation\/forked","kind":"symbol"},"doc://Forked/documentation/Forked/Version":{"identifier":"doc:\/\/Forked\/documentation\/Forked\/Version","title":"Version","type":"topic","role":"symbol","abstract":[{"text":"Used to chronologically order file versions. It is a standard lamport count.","type":"text"}],"navigatorTitle":[{"kind":"identifier","text":"Version"}],"url":"\/documentation\/forked\/version","fragments":[{"text":"struct","kind":"keyword"},{"text":" ","kind":"text"},{"text":"Version","kind":"identifier"}],"kind":"symbol"}}}
+{"sections":[],"schemaVersion":{"minor":3,"patch":0,"major":0},"metadata":{"title":"content(of:at:)","modules":[{"name":"Forked"}],"externalID":"s:6Forked16AtomicRepositoryC7content2of2atAA13CommitContentOyxGAA4ForkV_AA7VersionVtKF","fragments":[{"kind":"keyword","text":"func"},{"kind":"text","text":" "},{"text":"content","kind":"identifier"},{"text":"(","kind":"text"},{"kind":"externalParam","text":"of"},{"text":": ","kind":"text"},{"preciseIdentifier":"s:6Forked4ForkV","text":"Fork","kind":"typeIdentifier"},{"text":", ","kind":"text"},{"kind":"externalParam","text":"at"},{"text":": ","kind":"text"},{"preciseIdentifier":"s:6Forked7VersionV","text":"Version","kind":"typeIdentifier"},{"text":") ","kind":"text"},{"kind":"keyword","text":"throws"},{"text":" -> ","kind":"text"},{"kind":"typeIdentifier","text":"CommitContent","preciseIdentifier":"s:6Forked13CommitContentO"},{"kind":"text","text":"<"},{"text":"Resource","kind":"typeIdentifier"},{"kind":"text","text":">"}],"roleHeading":"Instance Method","symbolKind":"method","role":"symbol"},"hierarchy":{"paths":[["doc:\/\/Forked\/documentation\/Forked","doc:\/\/Forked\/documentation\/Forked\/AtomicRepository"]]},"identifier":{"url":"doc:\/\/Forked\/documentation\/Forked\/AtomicRepository\/content(of:at:)","interfaceLanguage":"swift"},"kind":"symbol","variants":[{"traits":[{"interfaceLanguage":"swift"}],"paths":["\/documentation\/forked\/atomicrepository\/content(of:at:)"]}],"primaryContentSections":[{"declarations":[{"languages":["swift"],"tokens":[{"text":"func","kind":"keyword"},{"kind":"text","text":" "},{"kind":"identifier","text":"content"},{"text":"(","kind":"text"},{"text":"of","kind":"externalParam"},{"text":" ","kind":"text"},{"text":"fork","kind":"internalParam"},{"kind":"text","text":": "},{"preciseIdentifier":"s:6Forked4ForkV","identifier":"doc:\/\/Forked\/documentation\/Forked\/Fork","text":"Fork","kind":"typeIdentifier"},{"text":", ","kind":"text"},{"kind":"externalParam","text":"at"},{"kind":"text","text":" "},{"text":"version","kind":"internalParam"},{"kind":"text","text":": "},{"kind":"typeIdentifier","preciseIdentifier":"s:6Forked7VersionV","identifier":"doc:\/\/Forked\/documentation\/Forked\/Version","text":"Version"},{"kind":"text","text":") "},{"text":"throws","kind":"keyword"},{"kind":"text","text":" -> "},{"preciseIdentifier":"s:6Forked13CommitContentO","text":"CommitContent","kind":"typeIdentifier","identifier":"doc:\/\/Forked\/documentation\/Forked\/CommitContent"},{"text":"<","kind":"text"},{"text":"Resource","kind":"typeIdentifier"},{"kind":"text","text":">"}],"platforms":["macOS"]}],"kind":"declarations"}],"references":{"doc://Forked/documentation/Forked/AtomicRepository/content(of:at:)":{"type":"topic","identifier":"doc:\/\/Forked\/documentation\/Forked\/AtomicRepository\/content(of:at:)","abstract":[],"fragments":[{"kind":"keyword","text":"func"},{"text":" ","kind":"text"},{"kind":"identifier","text":"content"},{"text":"(","kind":"text"},{"text":"of","kind":"externalParam"},{"kind":"text","text":": "},{"text":"Fork","kind":"typeIdentifier","preciseIdentifier":"s:6Forked4ForkV"},{"text":", ","kind":"text"},{"kind":"externalParam","text":"at"},{"text":": ","kind":"text"},{"preciseIdentifier":"s:6Forked7VersionV","text":"Version","kind":"typeIdentifier"},{"text":") ","kind":"text"},{"text":"throws","kind":"keyword"},{"kind":"text","text":" -> "},{"text":"CommitContent","kind":"typeIdentifier","preciseIdentifier":"s:6Forked13CommitContentO"},{"text":"<","kind":"text"},{"text":"Resource","kind":"typeIdentifier"},{"text":">","kind":"text"}],"kind":"symbol","title":"content(of:at:)","url":"\/documentation\/forked\/atomicrepository\/content(of:at:)","role":"symbol"},"doc://Forked/documentation/Forked/CommitContent":{"abstract":[{"type":"text","text":"A wrapper to hold the resource. This allows for the resource to be"},{"text":" ","type":"text"},{"text":"absent in a fork, similar to using ","type":"text"},{"type":"codeVoice","code":"nil"},{"type":"text","text":"."}],"fragments":[{"text":"enum","kind":"keyword"},{"text":" ","kind":"text"},{"text":"CommitContent","kind":"identifier"}],"navigatorTitle":[{"text":"CommitContent","kind":"identifier"}],"type":"topic","url":"\/documentation\/forked\/commitcontent","title":"CommitContent","identifier":"doc:\/\/Forked\/documentation\/Forked\/CommitContent","role":"symbol","kind":"symbol"},"doc://Forked/documentation/Forked/AtomicRepository":{"kind":"symbol","identifier":"doc:\/\/Forked\/documentation\/Forked\/AtomicRepository","navigatorTitle":[{"kind":"identifier","text":"AtomicRepository"}],"role":"symbol","type":"topic","fragments":[{"kind":"keyword","text":"class"},{"kind":"text","text":" "},{"text":"AtomicRepository","kind":"identifier"}],"title":"AtomicRepository","url":"\/documentation\/forked\/atomicrepository","abstract":[{"type":"text","text":"An atomic repository is one that gets loaded completely into memory."},{"type":"text","text":" "},{"text":"If the ","type":"text"},{"code":"Resource","type":"codeVoice"},{"type":"text","text":" it contains conforms to "},{"type":"codeVoice","code":"Codable"},{"text":", the ","type":"text"},{"code":"AtomicRepository","type":"codeVoice"},{"type":"text","text":" is"},{"text":" ","type":"text"},{"text":"also ","type":"text"},{"code":"Codable","type":"codeVoice"},{"type":"text","text":", and can be converted to a serialized form and saved as a file."},{"type":"text","text":" "},{"type":"text","text":"Saving and loading are atomic, that is, the whole repository is loaded from file, and the whole"},{"type":"text","text":" "},{"text":"file is written to disk.","type":"text"}]},"doc://Forked/documentation/Forked":{"title":"Forked","type":"topic","kind":"symbol","url":"\/documentation\/forked","abstract":[{"type":"text","text":"A framework for handling shared data with confidence in Swift."}],"role":"collection","identifier":"doc:\/\/Forked\/documentation\/Forked"},"doc://Forked/documentation/Forked/Fork":{"abstract":[{"type":"text","text":"A type representing a named fork."}],"type":"topic","title":"Fork","role":"symbol","url":"\/documentation\/forked\/fork","identifier":"doc:\/\/Forked\/documentation\/Forked\/Fork","navigatorTitle":[{"kind":"identifier","text":"Fork"}],"fragments":[{"text":"struct","kind":"keyword"},{"text":" ","kind":"text"},{"kind":"identifier","text":"Fork"}],"kind":"symbol"},"doc://Forked/documentation/Forked/Version":{"abstract":[{"text":"Used to chronologically order file versions. It is a standard lamport count.","type":"text"}],"role":"symbol","url":"\/documentation\/forked\/version","kind":"symbol","fragments":[{"kind":"keyword","text":"struct"},{"kind":"text","text":" "},{"kind":"identifier","text":"Version"}],"identifier":"doc:\/\/Forked\/documentation\/Forked\/Version","title":"Version","type":"topic","navigatorTitle":[{"kind":"identifier","text":"Version"}]}}}