Concept of Version Control System
Concept of Version Control System
Day 2.
1. Branching. (Demo)
a. Branching means you diverge from the main line of development and
continue to do work without messing with that main line.
b. git branch <branch name> – Creates a new branch.
c. git checkout <branch name> –It is used to switch branches, whenever the
work is to be started on a different branch.
d. git checkout -b <branch name> - creates a branch of that name and switch to
it.
e. https://www.atlassian.com/git/tutorials/using-branches
2. Collaborating with git
a. git clone <remote_URL> – Makes an identical copy of the latest version of a
project in a repository and saves it to your computer.
b. git pull <remote> – Used to get updates from the remote repository.
c. git push -u origin <branch name> – Sends local commits to the remote
repository.
3. Merge and solving conflict. (Demo)
a. Merging is Git's way of putting a forked history back together again. The git
merge command lets you take the independent lines of development created
by git branch and integrate them into a single branch.
b. https://www.atlassian.com/git/tutorials/using-branches/git
4. Exercise for day: https://gitexercises.fracz.com/ (Day 2 and 3)
Extra : https://www.atlassian.com/git
Download Book:
https://github.com/progit/progit2/releases/download/2.1.426/progit.pdf
Git CheatSheet: https://www.atlassian.com/git/tutorials/atlassian-git-
cheatsheet