Mako Hill Wikimania 2007 Resonant Divergance Collaboration in Diverged Branches MIT Media Lab Electronic Publishing Group Computing.

Slides:

Advertisements

Similar presentations

CustomWare Australia - United States - Malaysia - New Zealand - Singapore.

Advertisements

Roman Kvasov. Polar - Cartesian conversions Polar - Cartesian image processing.

DEPARTMENT OF INFORMATION TECHNOLOGY

1 Mind Visual Diff An architecture comparison tool December 16 th, 2014 – v0.2.2 Seyvoz Stephane Assystem.

COMPUTER APPLICATIONS Mr. Toscano Computer Concepts Lesson Objectives Students are introduced to the differences between computer software and computer.

The Electronic Battle Box Denis Gouin Defence Research & Development Canada.

ClearEye: An Visualization System for Document Revision CPSC 533C Project Update Qiang Kong Qixing Zheng.

1 SVN – Tool for Version Control Talal Ahmed ( ) Ali Ahsan ( ) Adil Zia Khan ( ) Farid Ullah ( )

COMP 6703 eScience Project Commercial Wiki of Academic Journal  Student : Yin Chen  Client/Technical Supervisor : Mr Tom Worthington  Academic Supervisor.

I.1 ii.2 iii.3 iv.4 1+1=. i.1 ii.2 iii.3 iv.4 1+1=

Team Collaboration across Business Value Chain – Approach of Internet Application Framework (IAF) Context Aware Collaboration in Mobile Enterprise Applications.

I.1 ii.2 iii.3 iv.4 1+1=. i.1 ii.2 iii.3 iv.4 1+1=

INTRO TO MAKING A WEBSITE Mark Zhang.  HTML  CSS  Javascript  PHP  MySQL  …That’s a lot of stuff!

Sara Bowman Center for Open Science Open Science Framework: Facilitating Transparency and Reproducibility.

Types of software. Sonam Dema..

 Simplify Your Life. Use Google Docs. ELIB 570 Final Presentation: Web 2.0 Tool.

Dr. Kurt Fendt, Comparative Media Studies, MIT MetaMedia An Open Platform for Media Annotation and Sharing Workshop "Online Archives:

Web 2.0 and Social Media Whittney Smith, Ed.D. Dear Teacher, Calling me by name is a start, but how about knowing what I'm interested in learning more.

Software Process Guidelines VIETTEL Corporation. CONTENTS I.Standard folder structure II.Review Process III.Data Repository IV.Naming Convention 2.

Introduction to Versioning

DKT 214/3 Electronic Circuits Semester I 2010/11 School of Computer and Communication Engineering Universiti Malaysia Perlis.

F The Open University of Israel Collaborative Learning in a Wiki Environment Edna Tal Hagit Tal The Open University of Israel The Center for Technology.

Copyright © Software Carpentry 2012 This work is licensed under the Creative Commons Attribution License See

ONENOTE KEEPS TRACK OF STUFF AT WORK, HOME, OR SCHOOL.

1 SEG4912 University of Ottawa by Jason Kealey Software Engineering Capstone Project Tools and Technologies.

Publishing and Sharing Sherif Farag University of North Carolina at Chapel Hill, USA.

Information Systems and Network Engineering Laboratory II DR. KEN COSH WEEK 1.

How to Improve Operational Efficiencies with an Enterprise Document Management Solution.

Budapest, September 5th, 2002 DataGrid Accounting System DGAS Current status & plans Stefano Barale INFN Budapest, September.

Slide 1 Product Line Studio TM Features used for “Customization of Documents”

The iPlant Collaborative Community Cyberinfrastructure for Life Science Tools and Services Workshop Discovery Environment Overview.

ONENOTE ST CENTURY LEARNING TOOLS Tips and tools for working with OneNote in the Classroom.

March 31, 1998NSF IDM 98, Group F1 Group F Multi-modal Issues, Systems and Applications.

Cole David Ronnie Julio. Introduction Globus is A community of users and developers who collaborate on the use and development of open source software,

How to Access and Use the Faculty Wiki! TeleCoop Breckenridge, Colorado April 16, 2008 Facilitated by: Lisa Marie Johnson, Kathy Miles, and Jonathan Fuller.

Processing (Program Language) by Piseth Tep intro Processing is a code base visual design and electronic art programing. It were initiated by Casey Reas.

 Programming - the process of creating computer programs.

Introduction to MediaWiki EnhanceEdu, IIIT-Hyderabad

Jordan-Webb - All Rights Reserved Tools and Techniques for Group Knowledge Management Paul Collins Jordan-Webb (847)

Papeete Welcome! Linux Intro & Network Management Papeete, French Polynesia Instructors: Hervey Allen(Chile/USA) Phil Regnauld(France/Denmark)

WP3 Design and Implementation of e-Hoop Learning platform & content Lefteris Kozanidis. PhD Hellenic Open University 1 e-Hoop 4 th Meeting Patras, Greece.

Introduction to Cloud Computing What is cloud? Use of computing resources (hardware and software) that are delivered as a service over a network Why cloud.

Transform® for Advanced Document Process Automation Andy Barnett-Picking K3BS AX Development Manager.

What is a Wiki? A wiki is an online database that can be edited by anyone with access to it. “ Wiki ” is Hawaiian meaning ‘ fast ’ or ‘ quick ’

BLACKBOARD WIKI TOOL From your Group…. There is a Group Tools menu and from there you select “Group Wiki”

Unix tools Regular expressions grep sed AWK. Regular expressions Sequence of characters that define a search pattern banana matches the text banana

Information Systems and Network Engineering Laboratory I DR. KEN COSH WEEK 1.

Multiplication Find the missing value x __ = 32.

O Multiple accelerator-related software projects are in isolated repositories. o Those repositories are scattered across the lab network. o Support for.

A Practical Approach to Version Control for SQL Server Steve Jones SQLServerCentral Redgate Software.

ΟΡΓΑΝΩΣΗ ΚΑΙ ΔΙΟΙΚΗΣΗ ΕΠΙΧΕΙΡΗΣΕΩΝ 3 Ο ΜΑΘΗΜΑ. ΟΙ ΜΕΓΑΛΕΣ ΕΠΙΧΕΙΡΗΣΕΙΣ Η δημιουργία μεγάλων επιχειρήσεων είναι ένα από τα χαρακτηριστικά του 20 ου αιώνα.

Mako Hill Penguicon 6.0 Laptop Liberation Benjamin Mako Hill One Laptop Per Child Project Free Software Foundation.

Computer Applications

Information Systems and Network Engineering Laboratory II

Future-oriented Benchmarking Through Social Media Analysis

Branching Strategy.

Software, Freedom and The World Beyond Computer Programs

Software Development Life Cycle (SDLC)

Future-oriented Benchmarking Through Social Media Analysis

CalAgPermits Update October 25, 2016.

Documentation in Continuous Delivery Model and DevOps

Wiki “wiki wiki”: Hawaiian for “very quick”

What is Open Science? [your name] [your job title] [your organisation]

Collaborative Text Editing

ОПЕРАТИВНА ПРОГРАМА “ИНОВАЦИИ И КОНКУРЕНТОСПОСОБНОСТ“ „Подобряване на производствения капацитет в МСП“

Version Control CS169 Lecture 7 Prof. Aiken CS 169 Lecture 7 1.

Solving Equations 3x+7 –7 13 –7 =.

Source Code Repository Restructuring

GODOT/CUFTS New Interface Demo and ILL Request Form

Chit fund software, Online Chit fund software,chit fund management software,chit fund accounting software,android chit fund software,chit fund software online

Presentation transcript:

Mako Hill Wikimania 2007 Resonant Divergance Collaboration in Diverged Branches MIT Media Lab Electronic Publishing Group Computing Culture Group Benjamin Mako Hill

Benjamin Mako Hill Wikimania 2007 Branching Basics

Mako Hill Wikimania 2007 Merging Basics

Mako Hill Wikimania 2007 The Goal Multiple Goals

Mako Hill Wikimania 2007 The Applications I. Offline Work II. Stable Versions III. Permenant Divergence

Mako Hill Wikimania 2007 State of the Art: Diff

Mako Hill Wikimania 2007 State of the Art: Software Merge Tools

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

Mako Hill Wikimania 2007 History Sensative Merging

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

Mako Hill Wikimania 2007 Resonance Quick Demo

Mako Hill Wikimania 2007 Implementation Details Python: Wiki, Document Model, Diff Bazaar: Differential Storage, Merge Algorithm Javascript: Conflict Resolution, Rendering

Mako Hill Wikimania 2007 Where To Get It!