1. - Ankit Agrawal
Git Internals

2. - Ankit Agrawal
File A
File B
Blob A
Blob B
File A# Blob A#
Commit 1 Commit 2
Tree AB Tree A#B
Branch 1
Branch 2
Tag 1 Tag 2HEAD
10,000 ft view

3. - Ankit Agrawal
Demo

4. - Ankit Agrawal
Merge

5. - Ankit Agrawal
C2
C7C6C5
C1 C3 C4 C8C0
Tree 1
- Blob A
- Blob B
Tree 2
- Blob A#
- Blob B
Tree 3
- Blob A#
- Blob B#
Tree 4
- Blob A##
- Blob B#
MERGE
Tree 8
- Blob A## <=> Blob A” conflict
- Blob B#
- Blob C#
Tree 5
- Blob A
- Blob B
- Blob C
Tree 6
- Blob A”
- Blob B
- Blob C
Tree 7
- Blob A”
- Blob B
- Blob C#
Tree 0
- Blob A

6. - Ankit Agrawal
C7
C1 C4 C8
Tree 4
- Blob A##
- Blob B#
MERGE
Tree 8
- Blob A## <=> Blob A” conflict
- Blob B#
- Blob C#
Tree 7
- Blob A”
- Blob B
- Blob C#
Tree 1
- Blob A
- Blob B

7. - Ankit Agrawal
Rebase

8. - Ankit Agrawal
C2
C7’ C6’
C5’C1 C3 C4C0
Tree 1
- Blob A
- Blob B
Tree 2
- Blob A#
- Blob B
Tree 3
- Blob A#
- Blob B#
Tree 4
- Blob A##
- Blob B#
Tree 5’
- Blob A##
- Blob B#
- Blob C
Rebase Conflict
Tree 6’
- Blob A” <=> Blob A##
- Blob B#
- Blob C
Tree 7’
- Blob A##”
- Blob B#
- Blob C#
Tree 0
- Blob A
C7C6C5
Tree 5
- Blob A
- Blob B
- Blob C
Tree 6
- Blob A”
- Blob B
- Blob C
Tree 7
- Blob A”
- Blob B
- Blob C#

9. - Ankit Agrawal
Thank You

10. - Ankit Agrawal
Questions
?
references :
-https://assets-cdn.github.com/images/modules/logos_page/Octocat.png
- http://icons.iconarchive.com/icons/alecive/flatwoken/512/Apps-Terminal-icon.png