From 499278062f47dcd64bf10074f750dd0aa355ef83 Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Mon, 3 Jun 2024 18:13:39 -0500 Subject: [PATCH] Add introduction to Git --- Notes.md | 4 ++++ ReadMe.md | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Notes.md b/Notes.md index 93ed80f..7579945 100644 --- a/Notes.md +++ b/Notes.md @@ -212,3 +212,7 @@ R packages can be saved in a persistent `~/work` directory so they do not need t R_LIBS_SITE=~/work/R ``` * Remember to "Open Project" for the project when starting a new environment. + +To display R Markdown files in Gitea, save the intermediate markdown file (`.md`), do the following: + + * Go to the settings for the R Markdown file (the gear on the file toolbar) and selecting "Output Options" -> "Advanced" -> and select "Keep markdown source file". \ No newline at end of file diff --git a/ReadMe.md b/ReadMe.md index d9b4fd2..cf3add5 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -18,6 +18,7 @@ Lessons (Day 2): * Welcome and overview * Sharing & collaborating with code (Github introduction) + * Introduction: https://happygitwithr.com/big-picture.html * https://swcarpentry.github.io/git-novice/01-basics.html * https://swcarpentry.github.io/git-novice/04-changes.html * https://swcarpentry.github.io/git-novice/05-history.html @@ -32,13 +33,18 @@ Lessons (Day 2): * Login to the environment (SKC-CARE): https://ci.skc.edu/ * Instructor Notes: [Notes.md](Notes.md) + * Git and R (recommended for students and as a teaching resource): https://happygitwithr.com/ * R Markdown: https://bookdown.org/yihui/rmarkdown/markdown-syntax.html - * Git and R (recommended): https://happygitwithr.com/ * Git book: https://git-scm.com/book/en * Git branching: + * https://happygitwithr.com/git-branches (and remotes https://happygitwithr.com/git-remotes) * https://nvie.com/posts/a-successful-git-branching-model/ * https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell * R Tutorial: https://www.cyclismo.org/tutorial/R/ * R project introduction http://cran.r-project.org/doc/manuals/R-intro.html * R Language: https://www.r-project.org/ * Test Driven Development (TDD) http://www.agiledata.org/essays/tdd.html + +### Advanced Materials + + * Git internals: "Git for Ages 4 And Up" - https://youtu.be/1ffBJ4sVUb4