From d468676ed4635c1528bc0dfaac686badd3a46c74 Mon Sep 17 00:00:00 2001
From: Ben Anderson <b.anderson@soton.ac.uk>
Date: Mon, 8 Jun 2020 14:05:13 +0100
Subject: [PATCH] Update resources.md

---
 resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources.md b/resources.md
index 25cf7c1..b2abc69 100644
--- a/resources.md
+++ b/resources.md
@@ -11,6 +11,7 @@
  * 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
+    * 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)
  * 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)
-- 
GitLab