Created by Kristin Sif Vigfusdottir
about 8 years ago
|
||
Version Control, A.k.a.
(nefndu 5)
Local Version Control kerfi
Centralized Version Control kerfi
Distributed Version Control kerfi
Version Control Benefits
Sandboxing
Branching and merging
Repository
Working copy
"Check out"
Locking
Non-locking
Trunk
Branch
Tag
Commit
Add
Head
Revision
Change
Change list
Merge
Conflict
Revert
Rollback
Version Control Limitations
When there is a conflict, the VCS may report a conflict and not let you commit — it’s up to you to commit a newer version that resolves this dilemma.
A few approaches:
Not the (main) purpose of VCS:
Centralized version control focuses on :
Distributed version control focuses on :
Centralized VCS are not good in
Distributed systems make branching and merging :
push:
pull:
Distributed Version Control
Key Advantages:
Distributed Version Control
Key Disadvanges: