02 - Version Control Flashcards
types of version control systems (3)
local
centralized
distributed
local database that keeps track of file versions
local vcs
vc systems either keep:
- actual copies of file versions
- patch sets
single server contains the file versions
centralized vcs
pros and cons of centralized vcs
(2 pros, 1 con)
pros:
- collaboration is possible
- easy to administer file permissions
con:
- single point of failure
machines fully mirror the repository
distributed vcs
pro/s and con/s of distributed vcs
(1,1)
pro/s:
- no single point of failure
con/s:
- large repositories may be impractical to mirror
advantages of vcs (6)
backup and restore
short term/long term undo
synchronization
track changes
track ownership
branching/merging
where files are stored
repository
local repos are also called _____
working copy
noun: copy of another repository
clone
verb: to record changes
commit
noun: a version or checkpoint
commit
latest commit in the repo
head
copy of the code base
branch
where is the stable code found (what branch)
main branch (master in Git)
different branches can be merged together
merge
when there are two or more conflicting changes to the same file
conflict
to get all the latest changes from the remote repo
update/sync
distributed version control system
Git
website/service designed to function with Git
GitHub
main function of GitHub
allows users to create git repositories on their server
