Skip to content

Commit

Permalink
Built site for gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
Quarto GHA Workflow Runner committed Sep 12, 2024
1 parent cc1c4d8 commit e6bf41e
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .nojekyll
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a520513f
c1783c2a
44 changes: 39 additions & 5 deletions lessons/6-github-collab/slides.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ <h2>Collaborating with GitHub</h2>
<section id="example-repo" class="slide level2">
<h2>Example repo</h2>
<ul>
<li><p>Everyone practice cloning this example repo as a new RStudio project: <a href="https://github.com/cct-datascience/repro-workshop-demo" class="uri">https://github.com/cct-datascience/repro-workshop-demo</a> <a href="#/footnotes" class="footnote-ref" id="fnref1" role="doc-noteref" data-footnote-href="#/fn1" onclick=""><sup>1</sup></a></p></li>
<li><p>Everyone practice cloning this example repo as a new RStudio project: <a href="https://github.com/cct-datascience/demo-repo-2024" class="uri">https://github.com/cct-datascience/demo-repo-2024</a> <a href="#/footnotes" class="footnote-ref" id="fnref1" role="doc-noteref" data-footnote-href="#/fn1" onclick=""><sup>1</sup></a></p></li>
<li><p>Need <strong>one</strong> volunteer to edit the README.md and practice commit + push</p></li>
</ul>
<aside></aside></section>
Expand Down Expand Up @@ -514,11 +514,11 @@ <h2>Merge, rebase, fast-forward??</h2>
<section id="fixing-a-merge-conflict" class="slide level2">
<h2>Fixing a Merge Conflict</h2>

<img data-src="merge_conflict.png" class="r-stretch"><ul>
<img data-src="merge_conflict.png" class="r-stretch"><ol type="1">
<li><p>Resolve the conflict however you want (i.e.&nbsp;keep one of the two sections)</p></li>
<li><p>Delete all lines with <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code>, <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code>, or <code>=======</code></p></li>
<li><p>Save and commit</p></li>
</ul>
</ol>
<aside class="notes">
<p>Let’s have a round of applause for our volunteer!</p>
<style type="text/css">
Expand Down Expand Up @@ -568,9 +568,42 @@ <h2>Avoid merge conflicts by working on branches</h2>
<h2>Working on a Branch</h2>
<ul>
<li><p>Make a new branch using RStudio’s Git pane (for this demo, use your name)</p></li>
<li><p>Commit changes and push to your branch</p></li>
<li><p>Make some edits (e.g.&nbsp;to README.md), save, add, commit.</p></li>
<li><p>You can go back to the “main” version of your project at any time.</p></li>
</ul>
<aside class="notes">
<p>Demonstrate 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.</p>
<style type="text/css">
span.MJX_Assistive_MathML {
position:absolute!important;
clip: rect(1px, 1px, 1px, 1px);
padding: 1px 0 0 0!important;
border: 0!important;
height: 1px!important;
width: 1px!important;
overflow: hidden!important;
display:block!important;
}</style></aside>
</section>
<section id="working-on-a-branch-1" class="slide level2">
<h2>Working on a Branch</h2>
<ul>
<li><p>Push your branch to GitHub</p></li>
<li><p>View changes on GitHub</p></li>
</ul>
<aside class="notes">
<p>Show how to look at different branches on GitHub</p>
<style type="text/css">
span.MJX_Assistive_MathML {
position:absolute!important;
clip: rect(1px, 1px, 1px, 1px);
padding: 1px 0 0 0!important;
border: 0!important;
height: 1px!important;
width: 1px!important;
overflow: hidden!important;
display:block!important;
}</style></aside>
</section>
<section id="pull-requests" class="slide level2">
<h2>Pull Requests</h2>
Expand Down Expand Up @@ -652,7 +685,8 @@ <h2>Practice</h2>
<p><strong>Exercise</strong></p>
</div>
<div class="callout-content">
<p>In pairs, practice <strong>forking</strong> and <strong>cloning</strong> a demo repo you do <em>not</em> have permission to push to. Make a new branch, make commits, and make a pull request to the upstream repo.</p>
<p>In pairs, practice <strong>forking</strong> and <strong>cloning</strong> a demo repo you do <em>not</em> have permission to push to: <a href="https://github.com/cct-datascience/demo-repo-fork-2024" class="uri">https://github.com/cct-datascience/demo-repo-fork-2024</a>.<br>
Make a new branch, make commits, and make a pull request to the upstream repo.</p>
</div>
</div>
</div>
Expand Down
13 changes: 10 additions & 3 deletions search.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
54 changes: 27 additions & 27 deletions sitemap.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,110 +2,110 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/survey_responses.html</loc>
<lastmod>2024-09-12T17:51:01.360Z</lastmod>
<lastmod>2024-09-12T20:53:21.199Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/1-project-management/slides.html</loc>
<lastmod>2024-09-12T17:51:01.328Z</lastmod>
<lastmod>2024-09-12T20:53:21.163Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/6-github-collab/slides.html</loc>
<lastmod>2024-09-12T17:51:01.360Z</lastmod>
<lastmod>2024-09-12T20:53:21.195Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/5-github-basics/notes.html</loc>
<lastmod>2024-09-12T17:51:01.356Z</lastmod>
<lastmod>2024-09-12T20:53:21.195Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/1-project-management/notes.html</loc>
<lastmod>2024-09-12T17:51:01.324Z</lastmod>
<lastmod>2024-09-12T20:53:21.163Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/9-intermediate-r-2/notes.html</loc>
<lastmod>2024-09-12T17:51:01.360Z</lastmod>
<lastmod>2024-09-12T20:53:21.199Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/8-intermediate-r-1/notes.html</loc>
<lastmod>2024-09-12T17:51:01.360Z</lastmod>
<lastmod>2024-09-12T20:53:21.199Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/7-data-manipulation/notes.html</loc>
<lastmod>2024-09-12T17:51:01.360Z</lastmod>
<lastmod>2024-09-12T20:53:21.195Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/4-git/slides.html</loc>
<lastmod>2024-09-12T17:51:01.356Z</lastmod>
<lastmod>2024-09-12T20:53:21.191Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/3-shell/slides.html</loc>
<lastmod>2024-09-12T17:51:01.348Z</lastmod>
<lastmod>2024-09-12T20:53:21.187Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/2-markdown-quarto/notes.html</loc>
<lastmod>2024-09-12T17:51:01.344Z</lastmod>
<lastmod>2024-09-12T20:53:21.183Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/11-getting-help/slides.html</loc>
<lastmod>2024-09-12T17:51:01.344Z</lastmod>
<lastmod>2024-09-12T20:53:21.183Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/10-get-credit/slides.html</loc>
<lastmod>2024-09-12T17:51:01.332Z</lastmod>
<lastmod>2024-09-12T20:53:21.171Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/about.html</loc>
<lastmod>2024-09-12T17:51:01.320Z</lastmod>
<lastmod>2024-09-12T20:53:21.159Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/10-get-credit/notes.html</loc>
<lastmod>2024-09-12T17:51:01.332Z</lastmod>
<lastmod>2024-09-12T20:53:21.171Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/11-getting-help/notes.html</loc>
<lastmod>2024-09-12T17:51:01.340Z</lastmod>
<lastmod>2024-09-12T20:53:21.179Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/12-drop-in/notes.html</loc>
<lastmod>2024-09-12T17:51:01.344Z</lastmod>
<lastmod>2024-09-12T20:53:21.183Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/2-markdown-quarto/slides.html</loc>
<lastmod>2024-09-12T17:51:01.344Z</lastmod>
<lastmod>2024-09-12T20:53:21.183Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/4-git/notes.html</loc>
<lastmod>2024-09-12T17:51:01.356Z</lastmod>
<lastmod>2024-09-12T20:53:21.191Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/5-github-basics/slides.html</loc>
<lastmod>2024-09-12T17:51:01.356Z</lastmod>
<lastmod>2024-09-12T20:53:21.195Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/7-data-manipulation/slides.html</loc>
<lastmod>2024-09-12T17:51:01.360Z</lastmod>
<lastmod>2024-09-12T20:53:21.195Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/8-intermediate-r-1/slides.html</loc>
<lastmod>2024-09-12T17:51:01.360Z</lastmod>
<lastmod>2024-09-12T20:53:21.199Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/9-intermediate-r-2/slides.html</loc>
<lastmod>2024-09-12T17:51:01.360Z</lastmod>
<lastmod>2024-09-12T20:53:21.199Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/3-shell/notes.html</loc>
<lastmod>2024-09-12T17:51:01.348Z</lastmod>
<lastmod>2024-09-12T20:53:21.187Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/6-github-collab/notes.html</loc>
<lastmod>2024-09-12T17:51:01.356Z</lastmod>
<lastmod>2024-09-12T20:53:21.195Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/index.html</loc>
<lastmod>2024-09-12T17:51:01.324Z</lastmod>
<lastmod>2024-09-12T20:53:21.159Z</lastmod>
</url>
<url>
<loc>https://cct-datascience.github.io/repro-data-sci/lessons/2-markdown-quarto/quarto_notes.html</loc>
<lastmod>2024-09-12T17:51:01.344Z</lastmod>
<lastmod>2024-09-12T20:53:21.183Z</lastmod>
</url>
</urlset>

0 comments on commit e6bf41e

Please sign in to comment.