Skip to content

Commit f3efbeb

Browse files
laderastladerast
committed
rerendering index.qmd
1 parent 652a358 commit f3efbeb

File tree

3 files changed

+253
-90
lines changed

3 files changed

+253
-90
lines changed

‎index.html‎

Lines changed: 26 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<script src="index_files/libs/quarto-html/tippy.umd.min.js"></script>
77
<link href="index_files/libs/quarto-html/tippy.css" rel="stylesheet">
88
<link href="index_files/libs/quarto-html/light-border.css" rel="stylesheet">
9-
<link href="index_files/libs/quarto-html/quarto-syntax-highlighting-dark-2b3e328b71be8d25427581baeb23079b.css" rel="stylesheet" id="quarto-text-highlighting-styles"><meta charset="utf-8">
10-
<meta name="generator" content="quarto-1.7.30">
9+
<link href="index_files/libs/quarto-html/quarto-syntax-highlighting-dark-707d8167ce6003fca903bfe2be84ab7f.css" rel="stylesheet" id="quarto-text-highlighting-styles"><meta charset="utf-8">
10+
<meta name="generator" content="quarto-1.8.25">
1111

1212
<title>Learning Git and GitHub</title>
1313
<meta name="apple-mobile-web-app-capable" content="yes">
@@ -28,7 +28,7 @@
2828
vertical-align: middle;
2929
}
3030
</style>
31-
<link rel="stylesheet" href="index_files/libs/revealjs/dist/theme/quarto-4b7f179142f17ca251a37dc34c50596b.css">
31+
<link rel="stylesheet" href="index_files/libs/revealjs/dist/theme/quarto-cfd31a45aad5dab724bf9591297a3541.css">
3232
<link href="index_files/libs/revealjs/plugin/quarto-line-highlight/line-highlight.css" rel="stylesheet">
3333
<link href="index_files/libs/revealjs/plugin/reveal-menu/menu.css" rel="stylesheet">
3434
<link href="index_files/libs/revealjs/plugin/reveal-menu/quarto-menu.css" rel="stylesheet">
@@ -120,9 +120,6 @@
120120
margin-right: 0;
121121
}
122122
</style>
123-
<script src="index_files/libs/quarto-diagram/mermaid.min.js"></script>
124-
<script src="index_files/libs/quarto-diagram/mermaid-init.js"></script>
125-
<link href="index_files/libs/quarto-diagram/mermaid.css" rel="stylesheet">
126123
</head>
127124
<body class="quarto-dark">
128125
<div class="reveal">
@@ -139,7 +136,6 @@ <h1 class="title">Learning Git and GitHub</h1>
139136
<h2>Introduce Yourself In Chat</h2>
140137
<ul>
141138
<li class="fragment">Your Name/Group/Pronouns</li>
142-
<li class="fragment">How did you spend Juneteenth weekend?</li>
143139
<li class="fragment">What you hope to learn today</li>
144140
</ul>
145141
</section>
@@ -165,8 +161,8 @@ <h2>Learning Objectives</h2>
165161
<li class="fragment"><strong>Explain</strong> the reasons we use repositories</li>
166162
<li class="fragment"><strong>Explain</strong> how version control tracks changes in your work</li>
167163
<li class="fragment"><strong>Make</strong> a branch in a repository</li>
168-
<li class="fragment"><strong>Make</strong> a fork of a repository that you don’t own</li>
169164
<li class="fragment"><strong>Make</strong> contributions to a repository using pull requests</li>
165+
<li class="fragment">(If time) <strong>Make</strong> a fork of a repository that you don’t own</li>
170166
</ul>
171167
</section>
172168
<section id="reminder-be-gentle-with-yourself-and-others" class="slide level2">
@@ -255,6 +251,7 @@ <h2>Git is a formal way of tracking changes</h2>
255251
<li class="fragment">Basically a snapshot of the file at that moment in time</li>
256252
<li class="fragment">We have one file, but many versions of that file</li>
257253
<li class="fragment">We only track changes in the file, not save the entire file</li>
254+
<li class="fragment">We can <strong>revert</strong> changes associated with a commit</li>
258255
</ul>
259256

260257
<img data-src="main-branch-bf6b49a2efd6b2dc9e311e7a666e2b52.png" class="r-stretch"></section>
@@ -270,38 +267,19 @@ <h2>What’s the diff-erence?</h2>
270267
<h2>Diff Example</h2>
271268

272269
<img data-src="diff.png" width="800" class="r-stretch quarto-figure-center"><p class="caption">Diff Example</p></section>
273-
<section id="we-can-fix-mistakes" class="slide level2">
274-
<h2>We can fix mistakes</h2>
275-
276-
<img data-src="main-branch-bf6b49a2efd6b2dc9e311e7a666e2b52.png" class="r-stretch"><ul>
277-
<li class="fragment">What if we made a mistake in code?</li>
278-
<li class="fragment">We can <strong>roll back</strong> or <strong>revert</strong> changes associated with a commit</li>
279-
</ul>
280-
</section>
281-
<section id="exercise-look-at-a-commit-history" class="slide level2">
282-
<h2>Exercise: Look at a commit history</h2>
270+
<section id="exercise-create-a-repository-and-make-a-commit" class="slide level2">
271+
<h2>Exercise: Create a repository and make a commit</h2>
272+
<p><a href="https://github.com/new" class="uri">https://github.com/new</a></p>
283273
<ul>
284-
<li class="fragment"><a href="exploring.html">Exploring Github Exercise</a></li>
274+
<li class="fragment">Create README.md</li>
285275
</ul>
286276
</section>
287-
<section id="more-about-commits" class="slide level2">
288-
<h2>More about commits</h2>
277+
<section id="exercise-look-at-a-complex-commit-history" class="slide level2">
278+
<h2>Exercise: Look at a complex commit history</h2>
289279
<ul>
290-
<li class="fragment">Commits have a <strong>message</strong></li>
291-
<li class="fragment">Commits can be done for multiple files at once</li>
280+
<li class="fragment"><a href="exploring.html">Exploring Github Exercise</a></li>
292281
</ul>
293282
</section>
294-
<section id="there-is-an-intermediate-step-staging" class="slide level2">
295-
<h2>There is an intermediate step: staging</h2>
296-
<ul>
297-
<li class="fragment">Exists to bundle multiple changes to a single commit</li>
298-
<li class="fragment">Is hidden in the web interface</li>
299-
</ul>
300-
<p><img data-src="staging.png"></p>
301-
302-
<aside><div>
303-
<p><a href="https://git-scm.com/about/staging-area" class="uri">https://git-scm.com/about/staging-area</a></p>
304-
</div></aside></section>
305283
<section id="ways-we-work-in-a-repository" class="slide level2">
306284
<h2>Ways we work in a repository</h2>
307285
<ul>
@@ -317,40 +295,6 @@ <h2>Git / GitHub is a way for multiple developers to work together</h2>
317295
<li class="fragment">The key with Git/GitHub is that multiple people can work on a repository at once</li>
318296
</ul>
319297
</section>
320-
<section id="what-is-the-difference-between-git-github" class="slide level2">
321-
<h2>What is the difference between Git / GitHub?</h2>
322-
<ul>
323-
<li class="fragment">Git is the software that does version control
324-
<ul>
325-
<li class="fragment">Use it on our own machines with command line git, Git Desktop, RStudio, etc.</li>
326-
</ul></li>
327-
<li class="fragment">GitHub is the website that hosts repositories and it uses Git
328-
<ul>
329-
<li class="fragment">Hosted repository is also called the <strong>remote</strong></li>
330-
</ul></li>
331-
</ul>
332-
</section>
333-
<section id="interacting-with-github" class="slide level2">
334-
<h2>Interacting with GitHub</h2>
335-
<div class="cell" data-reveal="true" data-layout-align="default">
336-
<div class="cell-output-display">
337-
<div>
338-
<p></p><figure class=""><p></p>
339-
<div>
340-
<pre class="mermaid mermaid-js">graph LR
341-
A[Our local machine] --git push ---&gt; B
342-
B["Remote Repo on GitHub"] --git pull--&gt; A
343-
</pre>
344-
</div>
345-
<p></p></figure><p></p>
346-
</div>
347-
</div>
348-
</div>
349-
<ul>
350-
<li class="fragment">Updating the <em>remote</em> from our <em>local</em> is called a <strong>push</strong></li>
351-
<li class="fragment">Updating the <em>local</em> from the <em>remote</em> is called a <strong>pull</strong></li>
352-
</ul>
353-
</section>
354298
<section id="how-do-we-do-this" class="slide level2">
355299
<h2>How do we do this?</h2>
356300
<ul>
@@ -381,7 +325,7 @@ <h2>Exercise: Add a Recipe to our Cookbook Repository!</h2>
381325
<p><a href="https://docs.google.com/spreadsheets/d/1CeSnF2_6YMJgcZvYDCgYZqk-YINx1cSKkSkBgVSvkwI/edit?gid=0#gid=0">Repository Member List</a></p>
382326
<p>Everyone is a member of this repository:</p>
383327
<ul>
384-
<li class="fragment"><a href="https://github.com/fhdsl/cookbook_summer_2025">cookbook_summer_2025</a></li>
328+
<li class="fragment"><a href="https://github.com/fhdsl/cookbook_winter_2026">cookbook_winter_2026</a></li>
385329
</ul>
386330
<p><a href="branching.html">Exercise: Add a Recipe</a></p>
387331
</section>
@@ -396,12 +340,6 @@ <h2>Make a Pull Request</h2>
396340
<h2>Exercise: Make a Pull Request</h2>
397341
<p><a href="pr.html">Exercise: Make a Pull Request</a></p>
398342
</section>
399-
<section id="now-comes-the-hard-part" class="slide level2">
400-
<h2>Now comes the hard part</h2>
401-
<ul>
402-
<li class="fragment">Integrating the changes from multiple branches</li>
403-
</ul>
404-
</section>
405343
<section id="reconciliation-of-branches-merging" class="slide level2">
406344
<h2>Reconciliation of Branches (merging)</h2>
407345

@@ -441,14 +379,11 @@ <h2>Branching/Merging works because of communication</h2>
441379
</section>
442380
<section id="merging-process" class="slide level2">
443381
<h2>Merging process</h2>
382+
<p>May involve…</p>
444383
<ul>
445-
<li class="fragment">Manual review process
446-
<ul>
447-
<li class="fragment">May start a conversation about the pull request</li>
448-
<li class="fragment">May submit reviews</li>
449-
<li class="fragment">May submit approvals</li>
450-
<li class="fragment">May deny the pull request</li>
451-
</ul></li>
384+
<li class="fragment"><p>Converse about the Pull Request</p></li>
385+
<li class="fragment"><p>Participate in Code Reviews</p></li>
386+
<li class="fragment"><p>Approve or Deny the Pull Request</p></li>
452387
</ul>
453388
</section>
454389
<section>
@@ -510,7 +445,7 @@ <h2>Resources</h2>
510445
<div class="quarto-auto-generated-content" style="display: none;">
511446
<p><img src="owl-logo.png" class="slide-logo"></p>
512447
<div class="footer footer-default">
513-
<p>https://github.com/fhdsl/cookbook_summer_2025</p>
448+
<p>https://github.com/fhdsl/cookbook_winter_2026</p>
514449
</div>
515450
</div></div>
516451

@@ -696,7 +631,7 @@ <h2>Resources</h2>
696631
margin: 0.1,
697632

698633
math: {
699-
mathjax: 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js',
634+
mathjax: 'https://cdn.jsdelivr.net/npm/mathjax@2.7.9/MathJax.js',
700635
config: 'TeX-AMS_HTML-full',
701636
tex2jax: {
702637
inlineMath: [['\\(','\\)']],
@@ -770,13 +705,14 @@ <h2>Resources</h2>
770705
e.clearSelection();
771706
}
772707
const getTextToCopy = function(trigger) {
773-
const codeEl = trigger.previousElementSibling.cloneNode(true);
774-
for (const childEl of codeEl.children) {
775-
if (isCodeAnnotation(childEl)) {
776-
childEl.remove();
777-
}
708+
const outerScaffold = trigger.parentElement.cloneNode(true);
709+
const codeEl = outerScaffold.querySelector('code');
710+
for (const childEl of codeEl.children) {
711+
if (isCodeAnnotation(childEl)) {
712+
childEl.remove();
778713
}
779-
return codeEl.innerText;
714+
}
715+
return codeEl.innerText;
780716
}
781717
const clipboard = new window.ClipboardJS('.code-copy-button:not([data-in-quarto-modal])', {
782718
text: getTextToCopy

0 commit comments

Comments
 (0)