From e6bf41edd8f2a2faa79178f279bd4a2f79c47364 Mon Sep 17 00:00:00 2001 From: Quarto GHA Workflow Runner Date: Thu, 12 Sep 2024 20:53:48 +0000 Subject: [PATCH] Built site for gh-pages --- .nojekyll | 2 +- lessons/6-github-collab/slides.html | 44 ++++++++++++++++++++--- search.json | 13 +++++-- sitemap.xml | 54 ++++++++++++++--------------- 4 files changed, 77 insertions(+), 36 deletions(-) diff --git a/.nojekyll b/.nojekyll index 3689fd7..2fd3a61 100644 --- a/.nojekyll +++ b/.nojekyll @@ -1 +1 @@ -a520513f \ No newline at end of file +c1783c2a \ No newline at end of file diff --git a/lessons/6-github-collab/slides.html b/lessons/6-github-collab/slides.html index 0d7b49f..eabb0ee 100644 --- a/lessons/6-github-collab/slides.html +++ b/lessons/6-github-collab/slides.html @@ -482,7 +482,7 @@

Collaborating with GitHub

Example repo

@@ -514,11 +514,11 @@

Merge, rebase, fast-forward??

Fixing a Merge Conflict

- + +
+
+

Working on a Branch

+ +

Pull Requests

@@ -652,7 +685,8 @@

Practice

Exercise

-

In pairs, practice forking and cloning a demo repo you do not have permission to push to. Make a new branch, make commits, and make a pull request to the upstream repo.

+

In pairs, practice forking and cloning a demo repo you do not have permission to push to: https://github.com/cct-datascience/demo-repo-fork-2024.
+Make a new branch, make commits, and make a pull request to the upstream repo.

diff --git a/search.json b/search.json index ed7d8a6..26591a3 100644 --- a/search.json +++ b/search.json @@ -200,7 +200,7 @@ "href": "lessons/6-github-collab/slides.html#example-repo", "title": "Collaborate With GitHub", "section": "Example repo", - "text": "Example repo\n\nEveryone practice cloning this example repo as a new RStudio project: https://github.com/cct-datascience/repro-workshop-demo 1\nNeed one volunteer to edit the README.md and practice commit + push" + "text": "Example repo\n\nEveryone practice cloning this example repo as a new RStudio project: https://github.com/cct-datascience/demo-repo-2024 1\nNeed one volunteer to edit the README.md and practice commit + push" }, { "objectID": "lessons/6-github-collab/slides.html#dealing-with-conflicts", @@ -242,7 +242,14 @@ "href": "lessons/6-github-collab/slides.html#working-on-a-branch", "title": "Collaborate With GitHub", "section": "Working on a Branch", - "text": "Working on a Branch\n\nMake a new branch using RStudio’s Git pane (for this demo, use your name)\nCommit changes and push to your branch\nView changes on GitHub" + "text": "Working on a Branch\n\nMake a new branch using RStudio’s Git pane (for this demo, use your name)\nMake some edits (e.g. to README.md), save, add, commit.\nYou can go back to the “main” version of your project at any time.\n\n\nDemonstrate how switching branches changes the files on their computer. Hammer home that this is why it is a bad idea to use git for projects on shared drives." + }, + { + "objectID": "lessons/6-github-collab/slides.html#working-on-a-branch-1", + "href": "lessons/6-github-collab/slides.html#working-on-a-branch-1", + "title": "Collaborate With GitHub", + "section": "Working on a Branch", + "text": "Working on a Branch\n\nPush your branch to GitHub\nView changes on GitHub\n\n\nShow how to look at different branches on GitHub" }, { "objectID": "lessons/6-github-collab/slides.html#pull-requests", @@ -270,7 +277,7 @@ "href": "lessons/6-github-collab/slides.html#practice", "title": "Collaborate With GitHub", "section": "Practice", - "text": "Practice\n\n\n\n\n\n\nExercise\n\n\nIn pairs, practice forking and cloning a demo repo you do not have permission to push to. Make a new branch, make commits, and make a pull request to the upstream repo.\n\n\n\n\nEncourage learners to use forking and cloning to explore and contribute to any code they can find on GitHub including R packages and research compendia." + "text": "Practice\n\n\n\n\n\n\nExercise\n\n\nIn pairs, practice forking and cloning a demo repo you do not have permission to push to: https://github.com/cct-datascience/demo-repo-fork-2024.\nMake a new branch, make commits, and make a pull request to the upstream repo.\n\n\n\n\nEncourage learners to use forking and cloning to explore and contribute to any code they can find on GitHub including R packages and research compendia." }, { "objectID": "lessons/6-github-collab/slides.html#resources", diff --git a/sitemap.xml b/sitemap.xml index f72ef8e..26f1036 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -2,110 +2,110 @@ https://cct-datascience.github.io/repro-data-sci/survey_responses.html - 2024-09-12T17:51:01.360Z + 2024-09-12T20:53:21.199Z https://cct-datascience.github.io/repro-data-sci/lessons/1-project-management/slides.html - 2024-09-12T17:51:01.328Z + 2024-09-12T20:53:21.163Z https://cct-datascience.github.io/repro-data-sci/lessons/6-github-collab/slides.html - 2024-09-12T17:51:01.360Z + 2024-09-12T20:53:21.195Z https://cct-datascience.github.io/repro-data-sci/lessons/5-github-basics/notes.html - 2024-09-12T17:51:01.356Z + 2024-09-12T20:53:21.195Z https://cct-datascience.github.io/repro-data-sci/lessons/1-project-management/notes.html - 2024-09-12T17:51:01.324Z + 2024-09-12T20:53:21.163Z https://cct-datascience.github.io/repro-data-sci/lessons/9-intermediate-r-2/notes.html - 2024-09-12T17:51:01.360Z + 2024-09-12T20:53:21.199Z https://cct-datascience.github.io/repro-data-sci/lessons/8-intermediate-r-1/notes.html - 2024-09-12T17:51:01.360Z + 2024-09-12T20:53:21.199Z https://cct-datascience.github.io/repro-data-sci/lessons/7-data-manipulation/notes.html - 2024-09-12T17:51:01.360Z + 2024-09-12T20:53:21.195Z https://cct-datascience.github.io/repro-data-sci/lessons/4-git/slides.html - 2024-09-12T17:51:01.356Z + 2024-09-12T20:53:21.191Z https://cct-datascience.github.io/repro-data-sci/lessons/3-shell/slides.html - 2024-09-12T17:51:01.348Z + 2024-09-12T20:53:21.187Z https://cct-datascience.github.io/repro-data-sci/lessons/2-markdown-quarto/notes.html - 2024-09-12T17:51:01.344Z + 2024-09-12T20:53:21.183Z https://cct-datascience.github.io/repro-data-sci/lessons/11-getting-help/slides.html - 2024-09-12T17:51:01.344Z + 2024-09-12T20:53:21.183Z https://cct-datascience.github.io/repro-data-sci/lessons/10-get-credit/slides.html - 2024-09-12T17:51:01.332Z + 2024-09-12T20:53:21.171Z https://cct-datascience.github.io/repro-data-sci/about.html - 2024-09-12T17:51:01.320Z + 2024-09-12T20:53:21.159Z https://cct-datascience.github.io/repro-data-sci/lessons/10-get-credit/notes.html - 2024-09-12T17:51:01.332Z + 2024-09-12T20:53:21.171Z https://cct-datascience.github.io/repro-data-sci/lessons/11-getting-help/notes.html - 2024-09-12T17:51:01.340Z + 2024-09-12T20:53:21.179Z https://cct-datascience.github.io/repro-data-sci/lessons/12-drop-in/notes.html - 2024-09-12T17:51:01.344Z + 2024-09-12T20:53:21.183Z https://cct-datascience.github.io/repro-data-sci/lessons/2-markdown-quarto/slides.html - 2024-09-12T17:51:01.344Z + 2024-09-12T20:53:21.183Z https://cct-datascience.github.io/repro-data-sci/lessons/4-git/notes.html - 2024-09-12T17:51:01.356Z + 2024-09-12T20:53:21.191Z https://cct-datascience.github.io/repro-data-sci/lessons/5-github-basics/slides.html - 2024-09-12T17:51:01.356Z + 2024-09-12T20:53:21.195Z https://cct-datascience.github.io/repro-data-sci/lessons/7-data-manipulation/slides.html - 2024-09-12T17:51:01.360Z + 2024-09-12T20:53:21.195Z https://cct-datascience.github.io/repro-data-sci/lessons/8-intermediate-r-1/slides.html - 2024-09-12T17:51:01.360Z + 2024-09-12T20:53:21.199Z https://cct-datascience.github.io/repro-data-sci/lessons/9-intermediate-r-2/slides.html - 2024-09-12T17:51:01.360Z + 2024-09-12T20:53:21.199Z https://cct-datascience.github.io/repro-data-sci/lessons/3-shell/notes.html - 2024-09-12T17:51:01.348Z + 2024-09-12T20:53:21.187Z https://cct-datascience.github.io/repro-data-sci/lessons/6-github-collab/notes.html - 2024-09-12T17:51:01.356Z + 2024-09-12T20:53:21.195Z https://cct-datascience.github.io/repro-data-sci/index.html - 2024-09-12T17:51:01.324Z + 2024-09-12T20:53:21.159Z https://cct-datascience.github.io/repro-data-sci/lessons/2-markdown-quarto/quarto_notes.html - 2024-09-12T17:51:01.344Z + 2024-09-12T20:53:21.183Z