1. http://mako.ccBenjamin Mako Hill Wikimania 2007 Resonant Divergance Collaboration in Diverged Branches MIT Media Lab Electronic Publishing Group Computing Culture Group Benjamin Mako Hill http://mako.cc

2. Benjamin Mako Hill Wikimania 2007 Branching Basics

3. http://mako.ccBenjamin Mako Hill Wikimania 2007 Merging Basics

4. http://mako.ccBenjamin Mako Hill Wikimania 2007 The Goal Multiple Goals

5. http://mako.ccBenjamin Mako Hill Wikimania 2007 The Applications I. Offline Work II. Stable Versions III. Permenant Divergence

6. http://mako.ccBenjamin Mako Hill Wikimania 2007 State of the Art: Diff

7. http://mako.ccBenjamin Mako Hill Wikimania 2007 State of the Art: Software Merge Tools

8. http://mako.ccBenjamin Mako Hill Wikimania 2007 What are Wikis Missing? I. Merging II. History Sensative Merging III. Branch “Accounting” IV. Conflict Representation and Resolution V. Text Specific Interfaces

9. http://mako.ccBenjamin Mako Hill Wikimania 2007 History Sensative Merging

10. http://mako.ccBenjamin Mako Hill Wikimania 2007 Resonance A Wiki That Has... ● Branch Accounting ● History Sensative Merging ● Conflict Resolution And Work Toward... ● Using Mediawiki Articles as Branches ● Integration Into Other Wikis

11. http://mako.ccBenjamin Mako Hill Wikimania 2007 Resonance Quick Demo

12. http://mako.ccBenjamin Mako Hill Wikimania 2007 Implementation Details Python: Wiki, Document Model, Diff Bazaar: Differential Storage, Merge Algorithm Javascript: Conflict Resolution, Rendering

13. http://mako.ccBenjamin Mako Hill Wikimania 2007 Where To Get It! http://mako.cc http://mako.cc/copyrighteous