Version Control

Question 1

What are the benefits of version control?

Answer 1

Collaboration -> organised and smooth task collaboration among team members

Storing versions -> stores file versions after making changes

Restoring previous versions -> ability to revert to previous versions if needed

Understanding what happened -> changes accompanied by comments explain reason for change

Question 2

What are the 3 types of version control?

Answer 2

Local VC

Centralised VC

Distributed VC

Question 3

What is local VC?

Answer 3

On local PC
Not good for collaboration
Error prone

Question 4

What is centralised VC?

Answer 4

Trad. method to enable collaboration among devs on same project

Single server contains all versioned files and clients can check file from that place

Risk -> if server fails the data can be lost

Question 5

What is distributed VC?

Answer 5

Modern VC systems where everyone gets a copy of the files on their local machine

Allows many backup copies to exist

Question 6

What is Git?

Answer 6

Free, open-source distributed version control system

Question 7

What are the main functions in Git?

Answer 7

Commit -> snapshot of changes

Branch -> separate version of project files, each branch has a name and a chronological chain of commits

New branch -> when created, files in the main branch are replicated. changes that are not in the main branch should be made here

Question 8

What are the git commands?

Answer 8

git init - creates an empty git repo
git add - adds file contents to staging area
git commit - records changes to repo
git checkout - switch between files, commits or branches
git push - update remote repo with committed files
git fetch - download files from another repo
git merge - join two or more development histories together
git pull - fetch from and integrate with another repo or local branch
git branch - create, list, rename or delete a branch
git status - shows current status of branching and HEAD position

Question 9

What is Github?

Answer 9

Remote host for git repositories

Facilitates:
- version control
- collaboration
- issue tracking

Question 10

What is a protected main branch?

Answer 10

Projects often have a protected main branch that is
- clean error-free version of code
- in remote/shared rpo
- cannot push directly
- must request to add changes to main branch

Question 11

What is a PR?

Answer 11

Pull request - request made when you want to add changes to the main branch

Allows quality control of code that is in the main branch