From dcbfaca9bf1a862a51165b19920a62d840fd851e Mon Sep 17 00:00:00 2001
From: Ben Anderson <b.anderson@soton.ac.uk>
Date: Wed, 3 Jun 2020 18:52:16 +0100
Subject: [PATCH] Update resources.md
---
resources.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/resources.md b/resources.md
index a179a97..25cf7c1 100644
--- a/resources.md
+++ b/resources.md
@@ -9,7 +9,10 @@
* and much more, although:
* we don't agree with [keeping your data in your project](https://rstats.wtf/project-oriented-workflow.html#work-in-a-project). Data should be somewhere else, _unless you're a .gitignore wizard_ and your data is small (and non-sensitive/non-commercial/public etc)
* using [git(hub/lab)](https://happygitwithr.com/) for version control (perhaps via [usethis](https://usethis.r-lib.org/) and knowing about [ohshitgit](https://ohshitgit.com/) just in case)
- * using [git branches](https://twrushby.wordpress.com/2017/03/27/collaboration-with-rstudio-and-git-using-branches/) as a way for different people to work on the same project without clashing - [ohshitgit](https://ohshitgit.com/) may be required here too
+ * using [git branches](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell) as a way for different people to work on the same project without clashing
+ * Tom has [blogged](https://twrushby.wordpress.com/2017/03/27/collaboration-with-rstudio-and-git-using-branches/) about this
+ * [HappyGit](https://happygitwithr.com/fork-and-clone.html) gives you the details
+ * [ohshitgit](https://ohshitgit.com/) may be required here too (but not if you've followed the instructions above)
* using [git(hub/lab) issues](https://guides.github.com/features/issues/) as a way to manage your project - just like we did for the [new ECCD website](https://git.soton.ac.uk/SERG/sergwebsite/-/issues)
* how to use [drake](https://docs.ropensci.org/drake/) to massively speed up and [manage your workflow](https://milesmcbain.xyz/the-drake-post/). This includes always:
* loading and processing all your data inside a drake plan in a .R file. _So it only gets re-run if the code or data changes_
--
GitLab