Version Control Flashcards
Types of Version Control Systems.
Local
Centralized
Distributed
In this VCS, local database keeps track of file versions.
LocalVCS
What VCS is RCS (revision control system)
LocalVCS
VC system either keep: (2)
actual copies of file versions
patch sets, which are the set of additions/subtractions to a file.
In this VCS, there is a single server containing the file versions.
Centralized VCS
In this VCS, clients check out individual files/folders from the central server.
Centralized VCS.
What is the pros and cons of Centralized VCS?
- collaboration with others is possible
- easy to administer file permissions
- single point of failure
Example of Centralized VCS.
CVS
Subversion
Perforce
In this VCS, machines fully mirror the repository, including history of changes.
Distributed VCS.
In this VCS, with a peer-to-peer approach.
Distributed VCS
Pros and Cons of Distributed VCS
- No single point of failure.
- Large repositories may be impractical to mirror.
Examples of Distributed VCS
Git
Mecurial
Bazaar
Darcs
Subversion
Advantage of VCS that save all your changes and jump to any version anytime.
Backup and Restore
Advantage of VCS that there is no fear of experimental changes, whether short or long term.
Short-term/ Long-term undo
Advantage of VCS: stay up to date with teammates work.
Synchronization
Advantage of VCS: track the development of each file, and explain why the changes happened.
Track Changes
Advantage of VCS: find out who made a particular change.
Track ownership
Advantage of VCS: make a copy of your code that you can modify in isolation. You can delete, or merge this copy back to the main version.
Branching/Merging
Where the files are stored and can be remote or local.
Repository.
Also called the working copy.
Repository.
A copy of another repository (all the files and revision history)
Clone
To record the changes in the VC history/log.
Commit
A version or checkpoint that you can go back to any time.
Commit
The latest commit in the repository.
Head
A copy of the code base.
Branch
The stable code is usually found in a ____________.
Main Branch
To merge different branches.
Merge.
When there are two or more conflicting changes to the same file.
Conflict
To get all the latest changes from the remote repo and put them in your local repo.
Update/Sync
A website/service designed to function with Git but not other VCS.
GitHub
Main function of Github.
To create git repositories on their server.
