Skip to content

Commit c177fa7

Browse files
committed
Adding remotes page but not yet tweaked
1 parent 75ffb66 commit c177fa7

File tree

3 files changed

+523
-7
lines changed

3 files changed

+523
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
_build
22
_site.build
33
site.build
4+
git_materials
45
*~
56
*.swp
67
*.swo

docs/branches.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,10 +1019,7 @@ Conflict?
10191019

10201020
---
10211021

1022-
<!-- .slide: data-background="#ffffff" -->
1023-
10241022
## Exercises
1025-
<!-- .slide: style="font-size: 32px;" -->
10261023

10271024
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:
10281025

@@ -1032,12 +1029,8 @@ Each of the exercises has a README.md file with explanations and descriptions of
10321029

10331030
---
10341031

1035-
<!-- .slide: data-background="#ffffff" -->
1036-
10371032
### Exercises
10381033

1039-
<!-- .slide: style="font-size: 32px;" -->
1040-
10411034
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"
10421035

10431036
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

Comments
 (0)