diff --git a/howTo/otherResources.md b/howTo/otherResources.md index ef539381c0987ab798ce1edbd082009b44d30af4..be15af2a71e6571472809b9a05405af74f1e2a87 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)