[Wikireader] Quick intro re: offline viewing/editing

[Ángel González]

Samuel Klein wrote:
> On Wed, Jul 8, 2009 at 6:17 PM, Bjoern Hassler<bjoern at caret.cam.ac.uk> wrote:
>   
>> Another
>> question is why isn't wiki editing more like svn? If your commit doesn't
>> conflict, then it should be accepted. If there are conflicts, you need to
>> resolve conflicts.
>>     
MediaWiki tries to do that. On which scenarios does it fail?

svn isn't the best comparision for the model you're advocating. svn is
centralised. You'd want a
distributed VCS.
In fact, MediaWiki support the tree revision concept where two edits
have the same parent. However,
the GUI doesn't show it.
The disconnected wiki could push its changes to the articles and store
them as alternative article branches
if there are newer versions.
Users from any of the wikis could then browse both and perform a merge
(MediaWiki db would need to
learn that a merge unifies several branches).