Version Control Flashcards
Three types of Version Control System
Local
Centralized
Distribute
This VCS is a local database that keeps track of file version
Local VCS
VC system either keep:
actual copies of file version; or
patch sets (set of additions/subtractions to a file)
This VCS is a single server that contains the file versions. Here, clients check out individual files/folders from the central server.
e.g. (CVS (Concurrent Versions System), Subversions, Perforce)
Centralized VCS
What is the advantage of using centralized VC?
- Collaboration is possible
- Easy to administer file permissions
What is the cons of centralized VC?
Single point of failure.
In this VCS, machines fully mirror the repository, including the history of changes. Here, there is no single point of failure
Distributed VCS
Advantages of VCS
Backup and Restore
Short Term/ Long-term undo
Synchronization
Track Changes
Track Ownership
Branching/Merging
This is where files are stored. It can be remote or local.
Repository
Local repository are also called?
working copy
It is a copy of another repository including all the files, and revision history
clone
As a verb, what does commit mean?
To record the changes in the VC history/log
As a noun, what does commit mean?
A version or checkpoint that you can go back to anytime
This is the latest commit in the repository
Head
This is a copy of the code base. It can evolve separately from other.
Branch
The stable code is usually found in a main branch, which in Git is called?
master
Different branches can be —- together?
merge
This is when there are two or more conflicting changes to the same file. It must be resolved
conflicts
This is to get all the latest changes from the remote repo and put them in your local repo.
Update/Sync
Git is a what type of VCS?
Distributed
What is the main function of Github?
Allows users to create git repositories on their server.