From d4adf10b2a1dff7b45bce3daeca7dc37a492f558 Mon Sep 17 00:00:00 2001 From: Aaron Stewart Date: Wed, 28 Sep 2022 14:03:59 -0600 Subject: [PATCH 1/5] Update 1-introduction.yml --- github/introduction-to-github/1-introduction.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/github/introduction-to-github/1-introduction.yml b/github/introduction-to-github/1-introduction.yml index 57df3059..379eb507 100644 --- a/github/introduction-to-github/1-introduction.yml +++ b/github/introduction-to-github/1-introduction.yml @@ -4,11 +4,11 @@ title: Introduction metadata: title: Introduction description: Learn to use key GitHub features, including issues, notifications, branches, commits, and pull requests. - ms.date: 06/26/2020 + ms.date: 08/28/2022 author: tpetchel ms.author: thpetche ms.topic: interactive-tutorial ms.prod: learning-azure durationInMinutes: 2 content: | - [!include[](includes/1-introduction.md)] \ No newline at end of file + [!include[](includes/1-introduction.md)] From 4715b91bcade8ff49d7ba846e494d5feedb2a9ee Mon Sep 17 00:00:00 2001 From: Cami Hernandez Merhar <112580737+camihmerhar@users.noreply.github.com> Date: Thu, 29 Sep 2022 11:55:26 -0500 Subject: [PATCH 2/5] Update 1-introduction.md After walking through the content a couple of times and rereading the learning objectives a couple of things stood out to me. There were 6 learning objectives which seemed overwhelming and I felt we didn't set up the reader for what this module was truly about which are the basics. --- .../includes/1-introduction.md | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/github/introduction-to-github/includes/1-introduction.md b/github/introduction-to-github/includes/1-introduction.md index 6a8cd1f4..bcf002bc 100644 --- a/github/introduction-to-github/includes/1-introduction.md +++ b/github/introduction-to-github/includes/1-introduction.md @@ -8,16 +8,12 @@ In this module, you learn to use key GitHub features, including issues, notifica In this module, you will: -- Communicate with the project community in issues -- Manage notifications for project events -- Create branches to manage work in parallel -- Make commits to update project source -- Introduce changes with pull requests -- Deploy a web page to GitHub Pages -- Recognize the differences between Git and GitHub and the roles they play in the software development lifecycle -- Describe a repository fork and how it differs from a clone -- Explain the functionality of repository labels and where to apply them in issues and pull requests +- Recognize the differences between Git and GitHub +- Understand the basics of the following features of GitHub: + - Issues, notifications, branches, commits, pull requests, notifications, labels, actions, forks, and GitHub pages +- Learn how to: + - Create a branch, commit a file, open a pull request, and merge a pull request ## Prerequisites -- A GitHub account \ No newline at end of file +- A GitHub account From 8fbdc62755964b62e851147e346f4aa372377181 Mon Sep 17 00:00:00 2001 From: Cami Hernandez Merhar <112580737+camihmerhar@users.noreply.github.com> Date: Thu, 29 Sep 2022 12:38:20 -0500 Subject: [PATCH 3/5] Update 2-what-is-github.md I removed the subunit "The GitHub Flow," ironically for me it felt like it broke the flow of the unit, especially being at the very beginning. If it is in fact something someone must learn before they learn about the basic features of GitHub I feel like it should be a prerequisite to the course or be its own module. I also made some minor grammatical edits. --- .../introduction-to-github/includes/2-what-is-github.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/github/introduction-to-github/includes/2-what-is-github.md b/github/introduction-to-github/includes/2-what-is-github.md index 6c41a5c0..175f4202 100644 --- a/github/introduction-to-github/includes/2-what-is-github.md +++ b/github/introduction-to-github/includes/2-what-is-github.md @@ -1,9 +1,5 @@ Here, we discuss the key GitHub features you use on a daily basis to manage and contribute to software projects. -## The GitHub flow - -In addition to providing a platform for collaborative software development, GitHub also offers a workflow designed to optimize use of its various features. While this unit offers a cursory overview of important platform components, it's recommended that you first review [Understanding the GitHub flow](https://guides.github.com/introduction/flow/?azure-portal=true). - ## Git and GitHub As you work with **Git** and **GitHub**, you may wonder about the difference between the two. @@ -65,7 +61,7 @@ To learn more about GitHub commits, see [Committing and reviewing changes to you ## Pull Requests -A **pull request** is the mechanism used to signal that the commits from one branch are ready to be merged into another branch. The developer submitting the **pull request** will often request one or more reviewers to verify the code and approve the merge. These reviewers have the opportunity to comment on changes, add their own, or use the pull request itself for further discussion. Once the changes have been approved (if approval is required), the pull request's source branch (the compare branch) may be merged in to the base branch. +A **pull request** is the mechanism used to signal that the commits from one branch are ready to be merged into another branch. The developer submitting the **pull request** will often request one or more reviewers to verify the code and approve the merge. These reviewers have the opportunity to comment on changes, add their own, or use the pull request itself for further discussion. Once the changes have been approved (if approval is required), the pull request's source branch (the compare branch) may be merged into the base branch. :::image type="content" source="../media/2-pull-request.png" alt-text="GitHub pull requests provide a way to get commits from one branch into another branch." border="false"::: @@ -130,8 +126,9 @@ To learn more, see [Fork a repo](https://docs.github.com/en/free-pro-team@latest :::image type="content" source="../media/2-github-pages.png" alt-text="GitHub Pages is a hosting engine available with your GitHub account. It can be used to host static sites generated from your repository." border="false"::: -GitHub Pages sites for public repositories have been built and are deployed with GitHub Actions. GitHub Actions to build and deploy private and internal repositories are available as well, depending on your GitHub plan. You can include injecting secrets in your build process, gate deployments to require approvals before publishing, or add a build check to prevent bad commits from being deployed. +GitHub Pages sites for public repositories have been built and are deployed with GitHub Actions. You can use GitHub Actions to build and deploy private and internal repositories as well, depending on your GitHub plan. You can include injecting secrets in your build process, gate deployments to require approvals before publishing, or add a build check to prevent bad commits from being deployed. GitHub Pages track deployments instead of builds. A source branch is not required and is at the discretion of a workflow’s triggers. A deployment is required in the context of an environment (`github-pages` by default). As a result, environment protection rules are the new security mechanism for limiting deployments. To learn more, see [GitHub Pages](https://pages.github.com/?azure-portal=true). + From 6b6f534ed40b475d736ac53777bce96e7bbee39f Mon Sep 17 00:00:00 2001 From: Cami Hernandez Merhar <112580737+camihmerhar@users.noreply.github.com> Date: Thu, 29 Sep 2022 12:49:11 -0500 Subject: [PATCH 4/5] Update 5-summary.md I removed the sentence in the first paragraph about creating a GitHub page because after walking through the exercise it doesn't include it anymore and I updated the learning outcomes to be consistent with the changes I made to the launch page. --- .../includes/5-summary.md | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/github/introduction-to-github/includes/5-summary.md b/github/introduction-to-github/includes/5-summary.md index ccfd238a..6fa4b116 100644 --- a/github/introduction-to-github/includes/5-summary.md +++ b/github/introduction-to-github/includes/5-summary.md @@ -1,16 +1,12 @@ -In this module, you learned about the key features of GitHub, including issues, commits, and pull requests. You also used GitHub Pages to publish a public site based on the contents of your project. +In this module, you learned about the key features of GitHub, including issues, commits, and pull requests. You learned about: -- Communicating with the project community in issues -- Managing notifications for project events -- Creating branches to manage work in parallel -- Making commits to update project source -- Introducing changes with pull requests -- Deploying a web page to GitHub Pages -- Differences between Git and GitHub and the roles they play in the software development lifecycle -- How a repository fork differs from a clone -- Repository labels and where to apply them in issues and pull requests +- Recognize the differences between Git and GitHub +- Understand the basics of the following features of GitHub: + - Issues, notifications, branches, commits, pull requests, notifications, labels, actions, forks, and GitHub pages +- Learn how to: + - Create a branch, commit a file, open a pull request, and merge a pull request Now that you're familiar with the basics of GitHub, learn to [Upload your project by using GitHub best practices](/learn/modules/upload-project-github/). @@ -24,4 +20,4 @@ Here are some links to more information on the topics we discussed in this modul - [About the role of labels](https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/about-labels?azure-portal=true) - [GitHub Actions](https://docs.github.com/en/free-pro-team@latest/actions?azure-portal=true) - [Fork a repo](https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github/fork-a-repo?azure-portal=true) -- [Working with GitHub Pages](https://help.github.com/en/github/working-with-github-pages?azure-portal=true) \ No newline at end of file +- [Working with GitHub Pages](https://help.github.com/en/github/working-with-github-pages?azure-portal=true) From ae2611c814ac47693582f4524532982d949dc1c5 Mon Sep 17 00:00:00 2001 From: Cami Hernandez Merhar <112580737+camihmerhar@users.noreply.github.com> Date: Fri, 14 Oct 2022 11:25:32 -0500 Subject: [PATCH 5/5] Update index.yml Updated the learning objectives to reflect the updated ones in the introduction unit. --- github/introduction-to-github/index.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/github/introduction-to-github/index.yml b/github/introduction-to-github/index.yml index 907a4c98..3f352998 100644 --- a/github/introduction-to-github/index.yml +++ b/github/introduction-to-github/index.yml @@ -12,12 +12,11 @@ title: "Introduction to GitHub" summary: Learn to use key GitHub features, including issues, notifications, branches, commits, and pull requests. abstract: | In this module, you will: - - Communicate with the project community in issues - - Manage notifications for project events - - Create branches to manage work in parallel - - Make commits to update project source - - Introduce changes with pull requests - - Deploy a web page to GitHub Pages + - Recognize the differences between Git and GitHub + - Understand the basics of the following features of GitHub: + - Issues, notifications, branches, commits, pull requests, notifications, labels, actions, forks, and GitHub pages + - Learn how to: + - Create a branch, commit a file, open a pull request, and merge a pull request prerequisites: | - A GitHub account iconUrl: /learn/achievements/github/introduction-to-github.svg