Git Introduction with illustrations

Git
Telco Internship Avengers
Oct, 16th, 2019

Version Control System
3
What’s problem on version managing?

4
- Manage working history

5
- Undo some failed commits

6
- Cooperate between team members

7
- Cooperate between team members
- Review code before releasing features

Centralized Version Control System
8

9

10

11

12

13

14
Server 1 Repo Server 2 Repo

15

Distributed Version Control System
16

17

18

19

20

21

22

23

VCS history
24
Centralized VCS - SVN

VCS history
25
Linus Torvalds
Super popular distributed VCS

Making git to control the project
28
git init

29
git init

30
git add Readme.md

Committing the job
31
git commit -m “Add Readme”

Git commit
32

States of files in git
34
Change content of Readme.md

35
git add Readme.md

36
git commit -m “Change Readme”

Git commit
37

Add the remaining file
38
git add main.py

Commit the remaining file
39
git commit -m “Add main”

Git commit
40
git commit -m “Add code”

41
I have finished
coding, please
check
Share what
you have done
to me!

How to share commit history to peers?
42

Using git to share work to peers
44

Creating a remote repository
45
https://github.com/tom-jerry/TomJerry.git

Adding remote repository
46
git remote add origin https://github.com/tom-
jerry/TomJerry.git

Pushing local repository to remote
47
git push --set-upstream origin master

Sharing local commits to peer
48
master

Create a branch on remote repo
49
master
origin/master

Sharing local commits to peer
50
master
origin/master

Big picture from the local repo to the remote
repo
51

Cloning the repository
52
git clone <repo url>

Git branch
56
git branch feature_login

Git branch
57
git checkout feature_login

Git branch
58
register.py
Readme.md
Branch feature_login

Git branch
59
register.py
Readme.md
login.py

Git branch
60
login.pyregister.py update.py
Branch feature A
Readme.md

How to update new changes from master branch
to feature branch?
65
Git merge

67
Git merge
register.py login.py update.py
Readme.md Document.md Contribute.md

68
Continue commit after merging
register.py login.py update.py
Readme.md Document.md Contribute.md

Finally, and are working together smoothly
and easily

71
Conflict
Line Readme.md in master
4
5
6
...
One plus one equals two
Next step...

72
Conflict
Line Readme.md in branch A Readme.md in master
4
5
6
...
2 = 1 + 1
Done.
...
Next step...

73
Conflict
Line Readme.md in branch A Readme.md in master
4
5
6
...
2 = 1 + 1
Done.
...
Next step...
committed

74
Conflict
Line Readme.md in branch A Readme.md in master Readme.md in new master
4
5
6
...
2 = 1 + 1
Done.
...
Next step...
…
1 + 1 = 2
Next step...

75
Conflict
4
5
6
...
2 = 1 + 1
Done.
...
Next step...
…
1 + 1 = 2
Next step...
committed

76
Conflict
Merge branch master to A => Conflict!!!
4
5
6
...
2 = 1 + 1
Done.
...
Next step...
…
1 + 1 = 2
Next step...

77
Resolve Conflict
Why do we need to resolve conflict? And how?

78
Auto Resolve Conflict
4
5
6
...
2 = 1 + 1
Done.
...
Next step...
…
1 + 1 = 2
Next step...

79
Line Readme.md in branch A Final merge result Readme.md in new master
4
5
6
...
2 = 1 + 1
Done.
...
One plus one equals two.
Done.
…
1 + 1 = 2
Next step...

4
5
6
...
2 = 1 + 1
Done.
...
Done.
…
1 + 1 = 2
Done.
80
Merge branch master to A => Conflict!!! => Result

81
Manual Resolve Conflict
4
5
6
...
2 = 1 + 1
Done.
...
Done.
…
1 + 1 = 2
Done.

4
5
6
6
...
2 = 1 + 1
Done.
...
1 + 1 = 2
2 = 1 + 1
Done.
…
1 + 1 = 2
Done.
82
Manual resolve conflict options =>Accept Both Changes

83
4
5
6
...
2 = 1 + 1
Done.
...
1 + 1 = 2
Done.
…
1 + 1 = 2
Done.
Manual resolve conflict options =>Accept Incoming Changes

84
4
5
6
...
2 = 1 + 1
Done.
...
2 = 1 + 1
Done.
…
1 + 1 = 2
Done.
Manual resolve conflict options =>Accept Current Changes

85
4
5
6
...
2 = 1 + 1
Done.
...
Done.
…
1 + 1 = 2
Done.
Manual resolve conflict options =>Decline Both Changes

87
Resolve conflict using command line

92
Git log
git log --oneline --graph

95
Rebase vs master
Branch feature A
Branch master

96
Rebase vs master
Branch feature A
Branch master
If we use git merge

98
Rebase vs master
git rebase master
Branch master

99
Rebase vs master
Branch master

100
Rebase vs master
Branch master

101
Rebase vs master
Branch master

102
Rebase vs master
Branch master

10
3
Git merge vs git rebase
git merge
git rebase

Git stash
Feature login
Branch master

Another feature is broken
Feature login
Branch master

Let fix it
Feature login
Branch master
I want to fix it

Git stash
Feature login
Branch master
Git stash

Git stash
113
git stash pop
top

Git stash
Feature login
git stash
Branch master

After using git stash
Feature login
git stash
Branch master

Jerry jump to branch master
Feature login
Branch master
git checkout master

Jerry fixed issue
Feature login
Branch master

Jerry want to back his work
Feature login
Branch master Done! Go back
to my previous
work!

Jump to feature login branch
Feature login
Branch master
git checkout feature_login

Jerry continue his work
Feature login
Branch master

Jerry continue his work
Feature login
Branch master
git stash pop

Let fix it
Feature login
Branch master
Let continue
my work

127
git revert HEAD~2
Git revert

128
git revert HEAD~2
Git revert

129
git push origin master
Push after reverting
remote repo
local repo

130
git reset --hard HEAD~2
Git reset

131
git push --force origin master
Pushing after resetting
remote repo
local repo

132
Why do we need pull request
132
I have finished
coding, please
review.
Ok! Let me
check

133
How to create a pull request

134
How to create a pull request

Thank you for your participation!
148

Git Introduction with illustrations

Recommended

Recommended

More Related Content

Similar to Git Introduction with illustrations

Similar to Git Introduction with illustrations (20)

More from Thao Huynh Quang

More from Thao Huynh Quang (16)

Recently uploaded

Recently uploaded (20)

Git Introduction with illustrations