25 квітня відбувся вебінар від JavaScript Community – “Why Is Git Rebase?” Ганна Ліхтман — Senior Software Engineer, GlobalLogic. Під час вебінару дізнались, що таке git history, та чому важливо тримати її в чистоті і порядку. Яка різниця між merge та rebase. Що таке інтерактивний rebase та в чому його сила не тільки на словах, але й на практиці.

1. 1
Confidential
Why is Git Rebase?

2. 2
Confidential
Likhtman Hanna
IT experience over 8 years
Senior Software engineer in GlobalLogic
Architector. Wife. Mom. Founder of charity organisation. Mentor.
Traveler. Speaker. Overall a good person…
@h.likhtman
@Just0110

3. 3
Confidential
AGENDA: System
V
1. There is no “bad” history…
Q&A
2. Why we ever need this rebase?
Q&A
3. Let’s add some interactive!
Q&A
4. And now to practice
5. Tips & Tricks
6. Kahoot!
S
Control
C
Version
SVC
+memes

4. 4
Confidential
There is no “bad” history...

5. 5
Confidential
…wrong!

6. 6
Confidential

7. 7
Confidential

8. 8
Confidential
Task - Create a login modal form
1. Create modal
2. Create input
3. Create button
4. Create form (combine all together)
1. feat(login): create login form
2. feat(kit): create button
3. feat(kit): create input
4. feat(kit): create modal
fix(kit): change modal border radius
fix(kit): change button title
fix(kit): again change modal radius
fix(kit): final change of modal radius
fix(kit): add hooks for form
fix(kit): final final change of modal radius

9. 9
9
Confidential
Q&A

10. 10
Confidential
What is rebase?

11. 11
Confidential
Why we ever need this rebase?
To do everything as clean as possible and never
worry if you have done a mistake or your commits
are not descriptive, because with git rebase we can
alter the history of the branch completely.
When developers discuss clean code,
they often mention the single
responsibility principle - S in SOLID.
Code history ALSO related to code!

12. 12
Confidential

13. 13
13
Confidential
Q&A

14. 14
Confidential
Let’s add some interactive!
git rebase -i HEAD~N
or
git rebase --interactive HEAD~N

15. 15
Confidential
Work with commit

16. 16
Confidential
Work with branch

17. 17
Confidential
Create backup before rebasing (if…WHEN something goes wrong)
1. before running a git rebase to resolve conflicts run git branch BACKUP
2. after completing the rebase run git diff BACKUP to see if you broke anything during
rebase
3. if done run git branch -D BACKUP
4. if something went wrong:
git checkout BACKUP && git branch -D "<my-branch>" && git branch -m "<my-branch>"
to restore your state before the failed rebase

18. 18
Confidential
git branch BACKUP
git
branch
BACKUP
git branch BACKUP
g
i
t
b
r
a
n
c
h
B
A
C
K
U
P

19. 19
19
Confidential
Q&A

20. 20
20
Confidential
And now to practice….
almost

21. 21
Confidential
Practice?
1. git add .
2. git commit --fixup=5819b5c
3. git rebase -i --autosquash 5819b5c~1
1. feat(kit): create modal
2. feat(kit): create input
3. feat(kit): create button
4. feat(login): create login form
fix(kit): change modal border radius
fix(kit): change button title
fix(kit): again change modal radius
fix(kit): final change of modal radius
fix(kit): add hooks for form

22. 22
Confidential
fix(kit): change modal border radius
1. feat(kit): create modal
2. feat(kit): create input
3. feat(kit): create button
4. feat(login): create login form

23. 23
23
Confidential
And now to practice….

24. 24
Confidential
Tips & Tricks
1. git log --graph --decorate --pretty=oneline --abbrev-commit
2. git checkout main && git fetch --prune && git pull --rebase && git checkout - && git rebase -i main
3. git push --force-with-lease
4. git checkout BACKUP && git branch -D "<my-branch>" && git branch -m "<my-branch>"
git branch BACKUP
git
branch
BACKUP
git branch BACKUP
g
i
t
b
r
a
n
c
h
B
A
C
K
U
P

25. 25
25
Confidential
Kahoot!

26. 26
Confidential
Thank You