@@ -436,10 +436,6 @@ I have a bunch of branches (created previously by me and another user, for testi
436436
437437---
438438
439- <!-- .slide: style="font-size: 30px;" -->
440-
441- ## Example - continued
442-
443439Switch to the branch we are merging to (main)
444440
445441``` shell
@@ -460,10 +456,6 @@ Merge made by the 'recursive' strategy.
460456
461457---
462458
463- <!-- .slide: style="font-size: 27px;" -->
464-
465- ## Example - continued
466-
467459Let us do a status check
468460
469461``` shell
@@ -505,8 +497,6 @@ nothing to commit, working tree clean
505497
506498## First exercise - GitHub (if not setup already)
507499
508- <!-- .slide: style="font-size: 24px;" -->
509-
5105001 . Create a repository (click on the + at the top right of the menu or picking "Start a new repository" on your "home screen")
5115012 . Under "Quick setup", pick "creating a new file".
5125023 . Name the file "README.md" (at the top, over the file editor).
@@ -523,31 +513,25 @@ nothing to commit, working tree clean
523513
524514## Second exercise, SSH keys (if you have not set up already)
525515
526- <!-- .slide: style="font-size: 26px;" -->
527-
528516In this exercise you create SSH keys and upload to GitHub. Then test that it works.
529517
530518** Create a new SSH key**
531519
5325201 . Open a terminal (Git Bash on Windows). In the command below, "GitHub" is a label added to the key for clarity. You can add any you want:
533- a. Do this
534- ```
535- $ ssh-keygen -t ed25519 -C "GitHub"
536- ```
537- b. If you have an older system, this may work better
538- ```
539- $ ssh-keygen -t rsa -b 4096 -C "GitHub"
540- ```
521+ - a. Do this
522+ ```
523+ $ ssh-keygen -t ed25519 -C "GitHub"
524+ ```
525+ - b. If you have an older system, this may work better
526+ ```
527+ $ ssh-keygen -t rsa -b 4096 -C "GitHub"
528+ ```
541529
5425302. You will be asked for a file to save the key. Unless you have an existing SSH key, accept the default.
5435313. Enter a passphrase and repeat it.
544532
545533---
546534
547- ## Second exercise (cont.), SSH keys (if you have not set up already)
548-
549- <!-- .slide: style="font-size: 26px;" -->
550-
5515354. Add the key to the ssh-agent. Here we assume the default name:
552536```
553537$ eval "$(ssh-agent -s)"
0 commit comments