Update the talk and add excercise.md

talk/excercise.md

@@ -0,0 +1,41 @@
+# Excercise 
+
+1. Install github desktop. [Download](https://desktop.github.com/)
+
+2. Create a github account. [Sign up](https://github.com/signup)
+
+   Installation likely prompts for you to create an account, so you most likely have done this step.
+
+3. Fork the github-demo repository. [FRC7660/github-demo](https://github.com/FRC7660/github-demo).
+
+   You can do this in the web ui at the link above.
+
+4. Clone the github-demo to your local system.
+
+   * Make the repository in \users\YOURUSERNAME\src - my local path was C:\Users\scott\src\github-demo
+     You'll put source code and git repositories under this directory.
+   * Fork the repository ([doc](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop).)  When prompted you want "**To contribute to the parent project**".
+
+   * At this point you have 
+     * a fork of github-demo on your github accunt (mine is https://github.com/smoser/github-demo).
+       * a branch 'main'
+       * You can push commits to this fork or create new branches.
+     * a local repository: \Users\<username>\src\github-demo) which is a clone of your fork.
+       * a remote named 'origin' pointing to your  - You can push your local to this remote.
+       * a remote named 'upstream' pointing to frc7660/github-demo - You cannot push to this remote.
+
+5. Create a pull request with a change to one of the files.
+
+   * Create a local branch based off upstream 'main'.  Name it 'feature/best-ice-cream' or something to that effect.
+   * Open VSCode (or another editor)
+   * Make the change
+   * Commit the change with commit message describing your change.
+   * Make a pull request.
+
+6. Add your name to the list of team members in awesome-users.md
+   * Create another branch named 'feature/new-awesome-user'
+   * Make the change
+   * Commit the change
+   * Make a pull request
+
+7. Figure out who added Notre Dame to the list of schools.  And tell Mr. Moser who it was.

talk/talk.md

@@ -7,22 +7,40 @@
 
 ## Revision control basics
 
- - Commits
+ - Source Code
+ - Commits - a "change"
  - Branch
  - Tag / Release
 
 ## Git terms
 
- - clone
- - remote
- - push
- - Pull Request
+ - **Repository**
+ - **Upstream** (repository).
+ - **Clone** - to create a copy of a repository
+ - **Fork** - public clone of a repository
+ - **Branch** - repositories can contain any number of branches.
+   * main or master - common names for the "development" branch
+ - **Remote** - reference to or knowledge of another repository.
+   * typically you will have a "remote" configured for your fork and for upstream.
+ - **Push** - the act of copying changes from repository to a repository
+   * primarily you "push" a change from your local repository to your "fork"
+ - **Pull** - the act of copying changes to a repository from a repository
+ - **Pull Request** - Request another developer to pull changes from one repository to another
+   * typically you will do a pull request from your fork to upstream's main branch.
 
 ## Github
 
- - cloud based hosting platform that allows developers to manage their git repositories.
+ - Github is a cloud based hosting platform that allows developers to manage their git repositories.
+ - Much more than just git hosting.
+   * Issues
+   * Pull Requests
+   * github desktop
+   * continuous integration (c-i) - automatically build and test -code.
+ - There are other similar services. [gitlab](https://gitlab.com), [bitbucket](https://bitbucket.org/product).  Github is funded by Microsoft and has a huge amount of functionality for free.
 
 ## Github desktop
 
  - Graphical User Interface to git and github.
 
+## Excercise
+Complete the [Excercise](excercise.md).