Skip to content

Commit d2e493f

Browse files
committed
Added new illustrative photos from paper planes exercise
1 parent 259f0bc commit d2e493f

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed
Loading
Loading
Loading
Loading

quarto_course/skills/paper_planes_git.qmd

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,23 @@ But since they rely on each other, eventually it makes sense to have a central p
1010

1111
Our proxy for work will be small paper planes, made from post-it notes. You can think of these as akin to source code files.
1212

13+
![paper_plane](paper_planes_git_files/paper_plane_photo_1.png)
14+
1315
We will set up a table like in the image below, with two spaces for each person: their "working area" (right in front of them) and their "repository" (just further in front).
1416

1517
![v1](paper_planes_git_files/paper_planes_git_files_v-01.png)
16-
Git stores full versions of our working areas. This means all the files and folders in our source code project. Git stores full copies of work as it was. In our exercise we will use a folded piece of paper as a proxy. Think of it like a tray on which all our work sits. We will have lots of copies of these workspaces.
18+
Git stores full versions of our working areas. This means all the files and folders in our source code project. Git stores full copies of work as it was. In our exercise we will use a folded piece of white paper as a proxy. Think of it like a tray on which all our work sits. We will have lots of copies of these workspaces.
1719

1820
In this exercise we will be making lots of copies. And that is, fundamentally, how git works. For this reason it is really important that you take the time to make the needed copies.
1921

2022
We will need to make a new copy of a workspace each time work moves around. As we'll see that will happen when work moves out of a repository.
2123

2224
Our commit will be a creased piece of paper, with a paper plane on it, together with a name for the commit and a comment. We will write the name and comment directly on the creased piece of paper. The name we will use will be the letter V followed by three random letters. Examples could be `VKKT` or `VGTD` or `VLLT`. No need to worry about sequences, these are just names.
2325

26+
Here is an example of this exercise underway, see lots of copies of the postit planes and the white commit trays.
27+
28+
![exercise underway](paper_planes_git_files/paper_plane_photo_2.png)
29+
2430
## Sequential work
2531

2632
Our first scenario will be sequential work, meaning that the Originator works, then Improver1, then Improver2, but none working at the same time.
@@ -35,7 +41,9 @@ Our first scenario will be sequential work, meaning that the Originator works, t
3541
3. Improver1 does a "checkout" on that commit. This means making another copy of the commit (including the name, but not the comment) and the paper plane, as a starting point for work.
3642
![v5](paper_planes_git_files/paper_planes_git_files_v-05.png)
3743

38-
4. Improver1 makes an improvement to the checked out copy. Take the nose of the plane and fold it back.
44+
4. Improver1 makes an improvement to the checked out copy. Take the nose of the plane and fold it back. It should look like this:
45+
46+
![folded nose](paper_planes_git_files/paper_plane_photo_3.png)
3947
![v6](paper_planes_git_files/paper_planes_git_files_v-06.png)
4048

4149

@@ -54,7 +62,10 @@ Our first scenario will be sequential work, meaning that the Originator works, t
5462
9. Improver2 will then do a *checkout* which means making another complete copy of `VGDU` (which is the work as it was when Improver1 finished).
5563
![v11](paper_planes_git_files/paper_planes_git_files_v-11.png)
5664

57-
10. Improver2 can then do new work. Fold the tips of each wing up.
65+
10. Improver2 can then do new work. Fold the tips of each wing up. The plane should now look like this (see the folded nose from Improver1 and the newly folded up wing tips?):
66+
67+
![folded nose](paper_planes_git_files/paper_plane_photo_4.png)
68+
5869
![v12](paper_planes_git_files/paper_planes_git_files_v-12.png)
5970

6071
11. Improver2 can then commit that work back into their repository. Cross out the existing name (`VGDU`) and create a new name (e.g., `VFFD`), add a comment about the work that you've done.

0 commit comments

Comments
 (0)