Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
update pres 3
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam M. Wilson committed Sep 16, 2020
1 parent edbf6b9 commit 78391e5
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 77 deletions.
2 changes: 1 addition & 1 deletion Schedule.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ output:
---

```{r, echo=FALSE, message=FALSE, results='hide', purl=FALSE}
library(tidyverse)
library(tidyverse)
source("functions.R")
yamls=append(
Expand Down
20 changes: 9 additions & 11 deletions docs/pres/PS_03_Git.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ week: 2
</iframe>
<iframe src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSm_SdDqTPR5j7dXg_VeaUaKSxCVevvytsWQYKcT_kBCgOkKMsouHfafZ6wtbVjXaUSYxODReZgxAC3/pubhtml?gid=868447735&amp;single=true&amp;widget=true&amp;headers=false" style="height: 200px; width: 100%;"></iframe>

# Next Week's Case Study

<iframe
src="http://wilsonlab.io/GEO511/CS_03.html"
width="100%" height="800">
</iframe>
[source](http://wilsonlab.io/GEO511/CS_03.html)


# Version Control

Expand Down Expand Up @@ -185,17 +193,7 @@ Click the green arrow to sync with GitHub.

Git has many, many more features...

# Let's do it!

## Task 2 {data-background-iframe="../TK_03.html"}

[Task 2](../TK_03.html)

# More advanced Git

## Git command line from RStudio

RStudio has limited functionality.
RStudio GUI has limited functionality.

<img src="Week_03_Git_assets/CommandLine.png" alt="alt text" width="75%">

Expand Down
13 changes: 2 additions & 11 deletions docs/pres/PS_03_Git.html
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@ <h2>Let’s pick a winner!</h2>
<iframe src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSm_SdDqTPR5j7dXg_VeaUaKSxCVevvytsWQYKcT_kBCgOkKMsouHfafZ6wtbVjXaUSYxODReZgxAC3/pubhtml?gid=868447735&amp;single=true&amp;widget=true&amp;headers=false" style="height: 200px; width: 100%;">
</iframe>
</section></section>
<section id="next-weeks-case-study" class="title-slide slide level1"><h1>Next Week’s Case Study</h1></section>
<section><section id="version-control" class="title-slide slide level1"><h1>Version Control</h1></section><section id="version-control-with-file-names" class="slide level2">
<h2>Version control with file names</h2>
<ul>
Expand Down Expand Up @@ -623,20 +624,10 @@ <h2>Do’s and don’ts</h2>
<li><strong>DO NOT</strong> move files around after starting the course repository</li>
<li><strong>DO NOT</strong> edit/move the <code>.git</code> or <code>tests</code> folder</li>
</ul>
</section><section id="git-file-lifecycle" class="slide level2">
<h2>Git File Lifecycle</h2>
<p><img src="Week_03_Git_assets/lifecycle.png" alt="alt text" width="100%"></p>
</section><section id="and-much-more" class="slide level2">
<h2>And much more!</h2>
<p>Git has many, many more features…</p>
</section></section>
<section><section id="lets-do-it" class="title-slide slide level1"><h1>Let’s do it!</h1></section><section id="task-2" class="slide level2" data-background-iframe="../TK_03.html">
<h2>Task 2</h2>
<p><a href="../TK_03.html">Task 2</a></p>
</section></section>
<section><section id="more-advanced-git" class="title-slide slide level1"><h1>More advanced Git</h1></section><section id="git-command-line-from-rstudio" class="slide level2">
<h2>Git command line from RStudio</h2>
<p>RStudio has limited functionality.</p>
<p>RStudio GUI has limited functionality.</p>
<p><img src="Week_03_Git_assets/CommandLine.png" alt="alt text" width="75%"></p>
</section><section id="git-help" class="slide level2">
<h2>Git help</h2>
Expand Down
24 changes: 9 additions & 15 deletions docs/pres/PS_03_Git.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ week: 2
</iframe>
<iframe src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSm_SdDqTPR5j7dXg_VeaUaKSxCVevvytsWQYKcT_kBCgOkKMsouHfafZ6wtbVjXaUSYxODReZgxAC3/pubhtml?gid=868447735&amp;single=true&amp;widget=true&amp;headers=false" style="height: 200px; width: 100%;"></iframe>

# Next Week's Case Study

<iframe
src="http://wilsonlab.io/GEO511/CS_03.html"
width="100%" height="800">
</iframe>
[source](http://wilsonlab.io/GEO511/CS_03.html)


# Version Control

Expand Down Expand Up @@ -181,25 +189,11 @@ Click the green arrow to sync with GitHub.
* **DO NOT** move files around after starting the course repository
* **DO NOT** edit/move the `.git` or `tests` folder

## Git File Lifecycle

<img src="Week_03_Git_assets/Lifecycle.png" alt="alt text" width="100%">

## And much more!

Git has many, many more features...

# Let's do it!

## Task 2 {data-background-iframe="../TK_03.html"}

[Task 2](../TK_03.html)

# More advanced Git

## Git command line from RStudio

RStudio has limited functionality.
RStudio GUI has limited functionality.

<img src="Week_03_Git_assets/CommandLine.png" alt="alt text" width="75%">

Expand Down
2 changes: 1 addition & 1 deletion docs/pres/_site.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
css: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
output:
output:
revealjs::revealjs_presentation:
lib_dir: externals
keep_md: true
Expand Down
20 changes: 9 additions & 11 deletions pres/PS_03_Git.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ week: 2
</iframe>
<iframe src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSm_SdDqTPR5j7dXg_VeaUaKSxCVevvytsWQYKcT_kBCgOkKMsouHfafZ6wtbVjXaUSYxODReZgxAC3/pubhtml?gid=868447735&amp;single=true&amp;widget=true&amp;headers=false" style="height: 200px; width: 100%;"></iframe>

# Next Week's Case Study

<iframe
src="http://wilsonlab.io/GEO511/CS_03.html"
width="100%" height="800">
</iframe>
[source](http://wilsonlab.io/GEO511/CS_03.html)


# Version Control

Expand Down Expand Up @@ -185,17 +193,7 @@ Click the green arrow to sync with GitHub.

Git has many, many more features...

# Let's do it!

## Task 2 {data-background-iframe="../TK_03.html"}

[Task 2](../TK_03.html)

# More advanced Git

## Git command line from RStudio

RStudio has limited functionality.
RStudio GUI has limited functionality.

<img src="Week_03_Git_assets/CommandLine.png" alt="alt text" width="75%">

Expand Down
13 changes: 2 additions & 11 deletions pres/PS_03_Git.html
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@ <h2>Let’s pick a winner!</h2>
<iframe src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSm_SdDqTPR5j7dXg_VeaUaKSxCVevvytsWQYKcT_kBCgOkKMsouHfafZ6wtbVjXaUSYxODReZgxAC3/pubhtml?gid=868447735&amp;single=true&amp;widget=true&amp;headers=false" style="height: 200px; width: 100%;">
</iframe>
</section></section>
<section id="next-weeks-case-study" class="title-slide slide level1"><h1>Next Week’s Case Study</h1></section>
<section><section id="version-control" class="title-slide slide level1"><h1>Version Control</h1></section><section id="version-control-with-file-names" class="slide level2">
<h2>Version control with file names</h2>
<ul>
Expand Down Expand Up @@ -623,20 +624,10 @@ <h2>Do’s and don’ts</h2>
<li><strong>DO NOT</strong> move files around after starting the course repository</li>
<li><strong>DO NOT</strong> edit/move the <code>.git</code> or <code>tests</code> folder</li>
</ul>
</section><section id="git-file-lifecycle" class="slide level2">
<h2>Git File Lifecycle</h2>
<p><img src="Week_03_Git_assets/lifecycle.png" alt="alt text" width="100%"></p>
</section><section id="and-much-more" class="slide level2">
<h2>And much more!</h2>
<p>Git has many, many more features…</p>
</section></section>
<section><section id="lets-do-it" class="title-slide slide level1"><h1>Let’s do it!</h1></section><section id="task-2" class="slide level2" data-background-iframe="../TK_03.html">
<h2>Task 2</h2>
<p><a href="../TK_03.html">Task 2</a></p>
</section></section>
<section><section id="more-advanced-git" class="title-slide slide level1"><h1>More advanced Git</h1></section><section id="git-command-line-from-rstudio" class="slide level2">
<h2>Git command line from RStudio</h2>
<p>RStudio has limited functionality.</p>
<p>RStudio GUI has limited functionality.</p>
<p><img src="Week_03_Git_assets/CommandLine.png" alt="alt text" width="75%"></p>
</section><section id="git-help" class="slide level2">
<h2>Git help</h2>
Expand Down
24 changes: 9 additions & 15 deletions pres/PS_03_Git.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ week: 2
</iframe>
<iframe src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSm_SdDqTPR5j7dXg_VeaUaKSxCVevvytsWQYKcT_kBCgOkKMsouHfafZ6wtbVjXaUSYxODReZgxAC3/pubhtml?gid=868447735&amp;single=true&amp;widget=true&amp;headers=false" style="height: 200px; width: 100%;"></iframe>

# Next Week's Case Study

<iframe
src="http://wilsonlab.io/GEO511/CS_03.html"
width="100%" height="800">
</iframe>
[source](http://wilsonlab.io/GEO511/CS_03.html)


# Version Control

Expand Down Expand Up @@ -181,25 +189,11 @@ Click the green arrow to sync with GitHub.
* **DO NOT** move files around after starting the course repository
* **DO NOT** edit/move the `.git` or `tests` folder

## Git File Lifecycle

<img src="Week_03_Git_assets/Lifecycle.png" alt="alt text" width="100%">

## And much more!

Git has many, many more features...

# Let's do it!

## Task 2 {data-background-iframe="../TK_03.html"}

[Task 2](../TK_03.html)

# More advanced Git

## Git command line from RStudio

RStudio has limited functionality.
RStudio GUI has limited functionality.

<img src="Week_03_Git_assets/CommandLine.png" alt="alt text" width="75%">

Expand Down
2 changes: 1 addition & 1 deletion pres/_site.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
css: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
output:
output:
revealjs::revealjs_presentation:
lib_dir: externals
keep_md: true
Expand Down

0 comments on commit 78391e5

Please sign in to comment.