Section 8: Git merges

Section 8: Git merges
39 Intro to merging
5 mins
40 Fast forward merges
5 mins
41 Exercises with fast forward merges
2 mins
exercises-5.txt
478 Bytes
42 Exercises with fast forward merges — solutions
5 mins
43 Merge commits
10 mins
44 Exercises with merge commits
2 mins
exercises-6.txt
565 Bytes
45 Exercises with merge commits — solutions
7 mins
46 Deleting and recreating branches
5 mins
47 Conflicts
11 mins
48 Exercises with conflicts
2 mins
exercises-7.txt
644 Bytes
49 Exercises with conflicts — solutions
9 mins
50 Merge strategy
7 mins
51 Squash commits
6 mins
52 Rebase
9 mins
exercises-8.txt
800 Bytes
53 Rebase exercises
2 mins
54 Rebase exercise solutions
10 mins
55 Interactive rebase
8 mins