From bc6ad61c417d15bf67d6f5bb24cdf23bc2d5b11e Mon Sep 17 00:00:00 2001
From: Tom Rushby <t.w.rushby@soton.ac.uk>
Date: Thu, 1 Apr 2021 14:43:16 +0000
Subject: [PATCH] Update otherResources.md - link to Tom's setup guide for
git.soton forks etc
---
howTo/otherResources.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/howTo/otherResources.md b/howTo/otherResources.md
index ef53938..be15af2 100644
--- a/howTo/otherResources.md
+++ b/howTo/otherResources.md
@@ -9,8 +9,8 @@
* 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](keepingData.md), _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://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
+ * using git forks and [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 written a [setup guide](https://git.soton.ac.uk/SERG/feeg6025support/feeg6025-2020-2021/-/blob/master/Guides/SETUP.md) for getting started
* we have written a [short guide](gitBranches.md)
* [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)
--
GitLab