Skip to content

Commit

Permalink
Added new illustrative photos from paper planes exercise
Browse files Browse the repository at this point in the history
  • Loading branch information
jameshowison committed Jul 22, 2024
1 parent 259f0bc commit d2e493f
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 3 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 14 additions & 3 deletions quarto_course/skills/paper_planes_git.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,23 @@ But since they rely on each other, eventually it makes sense to have a central p

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.

![paper_plane](paper_planes_git_files/paper_plane_photo_1.png)

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).

![v1](paper_planes_git_files/paper_planes_git_files_v-01.png)
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.
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.

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.

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.

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.

Here is an example of this exercise underway, see lots of copies of the postit planes and the white commit trays.

![exercise underway](paper_planes_git_files/paper_plane_photo_2.png)

## Sequential work

Our first scenario will be sequential work, meaning that the Originator works, then Improver1, then Improver2, but none working at the same time.
Expand All @@ -35,7 +41,9 @@ Our first scenario will be sequential work, meaning that the Originator works, t
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.
![v5](paper_planes_git_files/paper_planes_git_files_v-05.png)

4. Improver1 makes an improvement to the checked out copy. Take the nose of the plane and fold it back.
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:

![folded nose](paper_planes_git_files/paper_plane_photo_3.png)
![v6](paper_planes_git_files/paper_planes_git_files_v-06.png)


Expand All @@ -54,7 +62,10 @@ Our first scenario will be sequential work, meaning that the Originator works, t
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).
![v11](paper_planes_git_files/paper_planes_git_files_v-11.png)

10. Improver2 can then do new work. Fold the tips of each wing up.
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?):

![folded nose](paper_planes_git_files/paper_plane_photo_4.png)

![v12](paper_planes_git_files/paper_planes_git_files_v-12.png)

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.
Expand Down

0 comments on commit d2e493f

Please sign in to comment.