What is this Version Control System ????

Version Control System

They are a category of software tools that helps record changes to files by keeping a track of modifications done to the code.

Problem That VCS Resolves

• Collaboration
• Storing Versions
• Figuring out what happaned
• Backup

version control 

 

Git Workflow

git commit

git add

git push

Let's Do

Hands-on

Branch

A branch represents an independent

line of development.

• Branch is a ‘branch’ from the main code trunk to try a new feature

• Not just trying new features, branches can be used to see these new features’ compatibility with the main trunk of the code

• When a git repo is initialized, it creates the default branch ‘master’

• If compatible, branches can be merged into the master branch

Branching

Merging Branch

Merge Conflict

A merge conflict is an event that

occurs when Git is unable to

automatically resolve differences

in code between two commits

made in two different branches

during a merge.

Repository

Think of this like a project folder where code is stored!

 

Important icons in

Repo Page

 

Files you should look first

 

 

• README.md

• LICENSE

• CONTRIBUTING.md

• CODE_OF_CONDUCT.md

• CHANGELOG.md

• .gitignore

Let's Do

Hands-on

ISSUES

a way to share a problem about someone else's code, without necessarily submitting your own solution

 

Pull Request

 

A way to ask to make changes to someone else's code by submitting your own changes for their review

 

Pull Request Icons

 

 

Let's Make a

Pull Request