Git Tutorial | Git Basics - Branching, Merging, Rebasing | Learn Git | DevOps Tutorial | Edureka

Devops Certification Training www.edureka.co/devops
Topics For Today’s Session
Version Control System
Version Control System Types
Version Control Tools
Git Workflow
Parallel Development & Stashing
Hands-On
1
2
3
4
5
6

Copyright © 2018, edureka and/or its affiliates. All rights reserved.
Scenario From Company

Scenario Of A Company
I hope client
likes this new
feature!

Sure! I will
remove this
feature
I do not like it!
So please
remove this
feature

But I have already
deleted that code! I
have to re write the
whole code again
Hey! I want
that feature
back!

Once saved, all
changes are
permanent and
can’t be reverted
back.
Downtime may
occur due to
faulty updates,
since there is no
backup
maintained
No collaboration
between the
team. So no
records are
maintained.
Chaos Caused Without Version Control

Version Control

Version Control System
Version control is the
management of changes
to documents, computer
programs, large web sites,
and other collections of
information.
These changes are usually
termed as “versions”.

Version Control Types

Version Control Types
Distributed Version Control SystemCentralized Version Control System
Repository
Repository Repository Repository
Working Copy Working Copy Working Copy
Workstation/
PC #1
Workstation/
PC #2
Workstation/
PC #3
Commit
Update
Commit
Update
Commit
Update
Push
Pull
Server
Repository
Working Copy Working Copy Working Copy
Workstation/
PC #1
Workstation/
PC #2
Workstation/
PC #3
Server
Commit
Update

Version Control System Tools
Version control has various tools like Git, Apache Subversion, Concurrent Version Systems, Team
Foundation Server, Mercurial etc.

Released under GPL’s
license. It is for free and is
open source.
Why Git wins over other tools?
Economical Non -Linear Snapshots Distributed
Speed Robust Integrity Branching

open source.
Supports non-linear
development of software.

open source.
Supports non-linear
Records changes made to
a file rather than file itself.

open source.
Supports non-linear
Every user has his own
copy of the repository
data stored locally.

open source.
Supports non-linear
Speed offered by Git is
lightening fast compared
to other VCS’s.

open source.
Supports non-linear
to other VCS’s.
Nearly every task in Git is
undo-able.

open source.
Supports non-linear
to other VCS’s.
No changes can be made
without Git recording it.
undo-able.

open source.
Supports non-linear
to other VCS’s.
No changes can be made
without Git recording it.
undo-able.
Every collaborator’s
working directory is in
itself a branch.

What is Git?
Git is an open source Distributed Version Control System(DVCS) which records changes made to
the files laying emphasis on speed, data integrity and distributed, non-linear workflows

Workflow of Git

Workflow Of Git

Parallel Development

Branching
Branching is an integral part of any Version Control(VC) System. Unlike other VC’s Git does not
create a copy of existing files for new branch. It points to snapshot of the changes you have
made in the system

Merging
Merging integrates the changes made in different branches into one single branch

Rebasing
Used when changes made in one branch needs to be reflected in another branch

Stashing

Stashing
Used when changes made in one branch needs to be reflected in another branch

Hands-On

Hands-On – Problem Statement
Company want a better
Source Code Management
System because the earlier
tool had the tendency to save
redundant code. Multiple
Developers working
simultaneously on same block
of code also caused problems.

Hands-On – Solution
Task is to move the
company’s code base to
git and Github.

Git Commands
Basic Commands
sudo apt-get install git git config --global user.name “username”
git initgit add <filename> git status git commit git diff
git rm <filename>
git rm --cached <filename>
git rm -f <filename>
git log
git tag --a <annotation> --m <message>
git add remote origin <remote link>
git tag
git show <tag-name>
git push origin master
git push origin --tags
git pull origin
git fetch origin

Git Commands
git stash pop
git stash save ‘message’ git stash list git stash apply <stash id>
git stash drop <stack id> git stash clear
Stashing Commands
Branching Commands
git branch <branchname> git checkout <branchname>
git branch -D <branchname>git branch -d <branchname>
git merge <branchname>
git branch

Git Tutorial | Git Basics - Branching, Merging, Rebasing | Learn Git | DevOps Tutorial | Edureka

Recommended

More Related Content

What's hot (20)

Similar to Git Tutorial | Git Basics - Branching, Merging, Rebasing | Learn Git | DevOps Tutorial | Edureka (20)

More from Edureka! (20)

Recently uploaded (20)

Git Tutorial | Git Basics - Branching, Merging, Rebasing | Learn Git | DevOps Tutorial | Edureka