From eece062eb953f3e88854be4eb788dfeee12bc9e8 Mon Sep 17 00:00:00 2001 From: "Caroline (Frank) Scherf" <105299358+fcaroline2020@users.noreply.github.com> Date: Sun, 22 Sep 2024 19:16:37 +0100 Subject: [PATCH] Git day 1 improvements (#242) * Adds intro, updates objectives to be testable, fixes grammer Update * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md * Update git-day-1/README.md --------- Co-authored-by: Sally McGrath --- git-day-1/README.md | 51 +++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/git-day-1/README.md b/git-day-1/README.md index 11cf484d..2f113959 100644 --- a/git-day-1/README.md +++ b/git-day-1/README.md @@ -1,13 +1,14 @@ -# Part 1 +# Git Day 1 -## ๐Ÿ’ก Purpose +Git is a tool for software development that you will likely come to rely on in your software development journey. It might seem complex at first but with continuous practice, you will begin to disentangle the complexity. -This workshop will deepen your understanding of Git, a tool crucial for collaborative software development. By the end of this workshop, participants will: -- Have hands-on experience in exploring GitHub repositories -- Creating forks, cloning repositories, branching, and committing changes -- Consolidate existing knowledge of Git -- Develop their **mental model** of the working tree and the staging area -- Learn to use basic Git CLI commands +## ๐Ÿ’ก Objective + +This workshop will deepen your understanding of Git. By the end of this workshop, participants will: +- [ ] Navigate a GitHub repository using the VSCode interface +- [ ] Fork and clone a repository, create branches, and commit changes using the VSCode interface +- [ ] Articulate the difference between a fork and clone +- [ ] Explain their mental model of the working tree and the staging area ## Setup @@ -71,7 +72,7 @@ Use the guidelines from the prep section of this week to create a fork. - โฒ๏ธ 5 mins - A volunteer will need to facilitate this section -A volunteer will need to navigate and let the group guide them in creating a fork as per the steps in the previous section. +A volunteer will need to navigate and let the group guide them in creating a fork. ## ๐ŸŒ€ Cloning a repository @@ -129,14 +130,11 @@ Next, create a local branch called `week-1-workshop` ### Learning objectives ```objectives - -- [ ] save local changes to a repository in VSCode -- [ ] stage local changes -- [ ] commit changes to a local branch -- [ ] define "pushing" -- [ ] push local changes on to remote repository - -``` +- [ ] Save local changes to a repository in VSCode +- [ ] Stage local changes +- [ ] Commit changes to a local branch +- [ ] Define "pushing" +- [ ] Push local changes onto a remote repository ### ๐Ÿ•น๏ธ Activity - Figure it out ๐Ÿ” @@ -149,8 +147,7 @@ Next, create a local branch called `week-1-workshop` Follow these instructions carefully. - -Our Git timeline starts off with some commits like this: +Our Git timeline starts with some commits like this: ![main-and-feature-in-sync](https://github.com/CodeYourFuture/CYF-Workshops/blob/main/git-day-1/main-and-feature-in-sync.png) @@ -313,7 +310,7 @@ A volunteer will need to navigate and let the group guide them in following thro ## ๐Ÿงต Tying things up -Now is some time to wrap up and try and discuss some of the key concepts from this week. +Now is some time to wrap up and discuss some of the key concepts from this week. ### ๐Ÿ—ฃ๏ธ Discussion in pairs @@ -322,13 +319,13 @@ Now is some time to wrap up and try and discuss some of the key concepts from th In your pair, discuss the following questions/tasks: -1. what is a commit? explain why need to make commits when we're developing a project? -1. explain why we store repositories on GitHub -1. describe the purpose of VSCode -1. explain the difference between Git and GitHub -1. explain why developers use branches -1. explain the difference between a fork and a clone? -1. what does the branch name `origin/main` mean instead of just `main` +1. What is a commit? Explain why we need to make commits when we're developing a project. +1. Explain why we store repositories on GitHub. +1. Describe the purpose of VSCode. +1. Explain the difference between Git and GitHub. +1. Explain why developers use branches. +1. Explain the difference between a fork and a clone. +1. What does the branch name `origin/main` mean instead of just `main` ? 1. Check out the following git repository diagram below: How many commits are in common between `week-1-feature` and `main`?