You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/branches.md
-7Lines changed: 0 additions & 7 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1019,10 +1019,7 @@ Conflict?
1019
1019
1020
1020
---
1021
1021
1022
-
<!-- .slide: data-background="#ffffff" -->
1023
-
1024
1022
## Exercises
1025
-
<!-- .slide: style="font-size: 32px;" -->
1026
1023
1027
1024
Each of the exercises has a README.md file with explanations and descriptions of what to do. You can find all of them in the subdirectory 5.branches. You should do them in the below order:
1028
1025
@@ -1032,12 +1029,8 @@ Each of the exercises has a README.md file with explanations and descriptions of
1032
1029
1033
1030
---
1034
1031
1035
-
<!-- .slide: data-background="#ffffff" -->
1036
-
1037
1032
### Exercises
1038
1033
1039
-
<!-- .slide: style="font-size: 32px;" -->
1040
-
1041
1034
3. Merge (BAD): This exercise gives an example of a merge that cannot be done automatically with the merge command. The exercise can be found in the subdirectory "3.merge-bad"
1042
1035
1043
1036
4. Rebasing (OK): In this exercise you will try the command rebase and see that it succeeds. The exercise can be found in the subdirectory "4.rebase-ok"
0 commit comments