Version Control Flashcards
Types of version control system
Local
Centralized
Distributed
Local database keeps track of file versions
Local VCS
VC systems either keep:
actual copies; or
patch sets
a single server contains the file versions
Centralized VCS
Examples of Centralized VCS
CVS
Subversion
Perforce
Machines fully mirror the repository, including the history of changes
peer-to-peer approach
each peer is a valid repository
Distributed VCS
Examples of Distributed VCS
Git
Mercurial
Bazaar
Darcs
TRUE OR FALSE
Single point failure == Distributed VCS
FALSE
Advantages of VCS
Backup & Restore
Short-term / Long-term undo
Synchronization
Track Changes
Track Ownership
Branching / Merging
Where the files are stored
Repository
types of repository
remote
local
a copy of another repository
clone
to record the changes in VC history/log
a version or checkpoint
Commit
latest commit
Head
copy of the code base
can evolve separately
Branch
contains the stable code
main branch (master in Git)
different branches combined
Merge
two or more conflicting changes to the same file
Conflict
TRUE OR FALSE
Conflicts must be resolved
TRUE
To get all latest changes from the remote repo and put them in your local repo
Update/Sync
TRUE OR FALSE
Git is dependent on Github
FALSE
a distributed VCS
free and open-source
primarily cmd line tool
Git
website/service design to function with Git
Github
Github Alts
GitLabs, BitBucket