Resolving merge conflicts.
Learn how to resolve merge conflicts and what is the difference between "merge" and "rebase".
This is part 4 of a series of video tutorials about git.
Full playlist: • Git tutorial for beginners
Timeline:
0:00 - intro
0:40 - what is a "merge conflict"?
1:50 - setting up merge conflict
6:43 - begin merging
7:35 - explaining content of the conflicting file
8:19 - resolving conflict
9:36 - continue merging, create merge commit
11:55 - what is rebase
13:50 - begin rebasing
14:20 - explaining content of the conflicting file
15:37 - continue rebasing
16:57 - git rebase is more dangerous
18:00 - summary