#87 Adds in branches and forks to the glossary and a terminology challenge

* Adds in branches and forks to the glossary and a terminology challenge

* Adds suggestion re naming of remotes with forks

Author: astroDimitrios

episodes/02-branching.md

@@ -292,7 +292,7 @@ merged onto the `develop` and `main` branches.
 For repositories where collaborators are a small and trusted group the Feature Branch
 model is normally sufficient.
 
-A Forking model is preferable if:
+A Forking model may be preferable if:
 
 - There are more collaborators, because the number of branches may become unwieldy. 
 - There are external collaborators whose contribution is valued,
@@ -309,6 +309,40 @@ You can find more information using the links below:
 - [From Novice to Pro: Understanding Git Branching Strategies, GitProtect](https://gitprotect.io/blog/from-novice-to-pro-understanding-git-branching-strategies/)
 - [What is a Git workflow?, GitLab](https://about.gitlab.com/topics/version-control/what-is-git-workflow/#forking-git-workflow)
 
+:::::::::::::::::::::::::::::::::::::::  challenge
+
+## Terminology
+
+Use the glossary to explain the differences between the following:
+
+- A branch
+- A remote
+- A fork
+
+:::::::::::::::  solution
+
+## Solution
+
+Learners are often confused by the difference
+between branches, remotes, and forks.
+
+- Branches are pointers to commits in a repository.
+  A repository will have multiple branches where
+  developers can work on features in parallel.
+- Remotes are **links** to other repositories.
+  These remotes usually link to repositories on
+  cloud platforms such as GitHub.
+  A repository typically has one or more remotes,
+  with the first called **origin**.
+- A fork is a copy of a repository created on GitHub.
+  When linking your local repository your fork becomes
+  the origin remote. The original repository you forked from
+  becomes the upstream remote.
+
+:::::::::::::::::::::::::
+
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
 :::::::::::::::::::::::::::::::::::::::: keypoints
 
 - A clearly communicated branching model helps developers.

learners/reference.md

@@ -13,6 +13,13 @@ title: 'Git Cheatsheets for Quick Reference'
 
 ## Glossary
 
+[branch]{#branch}
+:   A [branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches)
+is a pointer to a [commit](#commit).
+When you want to develop new changes
+you create a branch.
+The default branch in GitHub is `main`.
+
 [changeset]{#changeset}
 :   A group of changes to one or more files that are or will be added
 to a single [commit](#commit) in a [version control](#version-control)
@@ -31,6 +38,13 @@ that is incompatible with changes made by other users.
 Helping users [resolve](#resolve) conflicts
 is one of version control's major tasks.
 
+[fork]{#fork}
+:   A GitHub [fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo)
+is a copy of a [repository](#repository).
+It is used to develop changes freely without
+affecting the original project repository, or
+when you don't have write access on the original repository.
+
 [HTTP]{#http}
 :   The Hypertext Transfer [Protocol](#protocol) used for sharing web pages and other data
 on the World Wide Web.
@@ -77,5 +91,3 @@ small.
 Each set of changes creates a new [commit](#commit) of the files;
 the version control system allows users to recover old commits reliably,
 and helps manage conflicting changes made by different users.
-
-