Notes921

_practice/2022-09-21.md

@@ -0,0 +1 @@
+1. Try creating a merge conflict and resolving it using your favorite IDE.

_prepare/2022-09-21.md

@@ -0,0 +1,6 @@
+1. Read through the Grading Contract README and sample contracts. Start drafting your contract. Bring questions to class on Monday.
+1. Bring git questions or scenarios you want to be able to solve to class on Wednesday
+
+```{warning}
+the template contracts in the repo have an error in them; use the ones on the [course website](https://introcompsys.github.io/fall2022/syllabus/contract.html).
+```

_review/2022-09-19.md

@@ -4,11 +4,12 @@
 1. Review past classes activities (eg via the activities section on the left) and catchup if appropriate
 
 
-### Terminal File moving reflection
+
 
 Start with a file explorer open, but then try to close it and use only command line tools to explore and make your choices
 
 ```markdown
+### Terminal File moving reflection
 1. Did this get easier toward the end?
 1. Use the history to see which commands you used and how many times each, make a table below.
 1. Did you have to look up how to do anything we had not done in class?

_review/2022-09-21.md

@@ -0,0 +1,4 @@
+1. Read today's notes
+1. Update your KWL chart with the new items and any learned items.
+1. Update the title to any discussion threads you have created to be more descriptive
+1. add `branches.md` to your KWL repo and describe how branches work and what things to watch out for in your own words.

_toc.yml

@@ -20,6 +20,7 @@ parts:
       - file: notes/2022-09-12
       - file: notes/2022-09-14
       - file: notes/2022-09-19
+      - file: notes/2022-09-21
   - caption: Activities
     chapters:
     - file: activities/kwl