Version Control Jose Caraballo

What is version Control?

History

Local Version Control System SCCS (Source Code Control System) 1972,Unix only RCS (Reversion Control System) 1982, cross platform and text file only

 Centralized  CVS (Concurrent Versions System)  1986, first central repository, file focused  Perforce  Late 80`s widely used in the dotcom era, its google biggest repository  subversion  2000, track directory structure, non-text files  Microsoft Team Foundation Server  2004, supports source Control plus bug/work-item tracking and test features

 Distributed Version Control  Git  2005, created by Linus Torvalds after BitKeeper went commercial only.  Mercurial  2005, also created because BitKeeper went commercial only

Modern Version Control

Tracks changes

Committing

Commit  Git-commit  git-commit –a  git-commit –m 

Branching and merging

Branching A branch allows you to create a copy (or snapshot) of the repository that you can modify in parallel without altering the main set.

Merge git-merge - Join two or more development histories together

Branch Commands git branch === list your available branches git branch (branchname) === create a new branch git branch –v === see the last commit on each branch git checkout –b (branch name) === create and immedity change to branch

Merge commands  Git merge clean_up 

Diffing

Revisions and Change sets

Thank you