Revisionism harms History: Difference between revisions
No edit summary |
|||
| (6 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
== Performing version control == | [[File:Version_control_star_trek_style.jpg|right]] | ||
== Prerequisites == | |||
* a computer | |||
* a Internet | |||
* a lot of papers | |||
* a pen (your own) | |||
* a cookie (optional) | |||
== Club membership and special discounts== | |||
* First year NM: mandatory | |||
* Second year NM: optional | |||
* All years LB: optional | |||
== Performing version control - 12:30 > 15: 00 == | |||
With papers, pens and real people in the project room. (not like your imaginary internet friends). | With papers, pens and real people in the project room. (not like your imaginary internet friends). | ||
| Line 15: | Line 28: | ||
* merging and conflict solving | * merging and conflict solving | ||
== Hands on git == | == Hands on git - 15:30 > 18:00 == | ||
* Creating a local repository | * Creating a local repository | ||
Latest revision as of 22:16, 31 October 2011
Prerequisites
- a computer
- a Internet
- a lot of papers
- a pen (your own)
- a cookie (optional)
Club membership and special discounts
- First year NM: mandatory
- Second year NM: optional
- All years LB: optional
Performing version control - 12:30 > 15: 00
With papers, pens and real people in the project room. (not like your imaginary internet friends).
Individual approach
- ad-hoc manual file base collaboration
- manual version control
centralized version control
- playing the server and the clients client
- commiting, revisions and tags
- file locking, blaming
- branching and forking
decentralized version control
- everyone is a server! (and a client...)
- local commitment is good for the community
- merging and conflict solving
Hands on git - 15:30 > 18:00
- Creating a local repository
- ssh keys for everyone!
- Using gitorious/github/bla
- Puting in practice what we learn in the performance
- Revisionism harms history
- Life beyond decentralized version control
- The dark side of the fork