Skip to content
This repository was archived by the owner on Dec 12, 2025. It is now read-only.

Commit

Permalink
Update references and Git lessons
Browse files Browse the repository at this point in the history
  • Loading branch information
tmiddelkoop committed May 29, 2024
1 parent cb6e0c4 commit 1e6670d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 10 deletions.
9 changes: 2 additions & 7 deletions Notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ git config --local --list
* Verify Pull:
* "Pull" again and it should say "Already up to date."

## Lesson Notes
## Carpentry Workshop Lesson Notes

* For installing external libraries you can install them via RStudio after they have been referenced in a R Markdown file with a `library(ratdat)`.
* Note: The file must be saved before the option to install is shown.
Expand All @@ -155,7 +155,7 @@ git config --local --list
* Do not include `install.packages()` in your R Markdown files (other than `Setup.Rmd) as the R Markdown file is run every time it is displayed with "Knit" and will re-install the packages every time.


## References and Resources
## Technical Notes

RStudio keyboard shortcuts:

Expand All @@ -180,8 +180,3 @@ Check the status of your project with the remote repository. In a terminal run:
git fetch
git status
```

Resources:

* Git book: https://git-scm.com/book/en
* https://datacarpentry.org/R-ecology-lesson-alternative/introduction-r-rstudio.html
22 changes: 19 additions & 3 deletions ReadMe.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# SKC Carpentries Workshop June 2024
# SKC CI Workshop June 2024

*"If it's not Reproducible, it's Magic"*

## Lessons

Expand All @@ -16,10 +18,24 @@ Lessons (Day 2):

* Welcome and overview
* Sharing & collaborating with code (Github introduction)
* https://datacarpentry.org/rr-version-control/
* Technical overview of the infrastrcture.
* https://swcarpentry.github.io/git-novice/01-basics.html
* https://swcarpentry.github.io/git-novice/08-collab.html
* https://swcarpentry.github.io/git-novice/09-conflict.html (optional)
* https://swcarpentry.github.io/git-novice/10-open.html
* https://swcarpentry.github.io/git-novice/11-licensing.html
* Technical overview of the infrastructure.

## Resources

* Login to the environment (SKC-CARE): https://ci.skc.edu/
* Instructor Notes: [Notes.md](Notes.md)
* R Markdown: https://bookdown.org/yihui/rmarkdown/markdown-syntax.html
* R Language: https://www.r-project.org/
* R project introduction http://cran.r-project.org/doc/manuals/R-intro.html
* R Tutorial: https://www.cyclismo.org/tutorial/R/

* Git book: https://git-scm.com/book/en
* Git branching:
* https://nvie.com/posts/a-successful-git-branching-model/
* https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell
* Test Driven Development (TDD) http://www.agiledata.org/essays/tdd.html

0 comments on commit 1e6670d

Please sign in to comment.