From 319a92f6ee379701ac8d00ea11114b9ead08c714 Mon Sep 17 00:00:00 2001
From: "B.Anderson" <ba1e12@srv02405.soton.ac.uk>
Date: Sun, 17 May 2020 19:34:55 +0100
Subject: [PATCH] updated gitignore for OS X; updated template to match

---
 .gitignore  | 5 ++++-
 template.md | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 52c1c38..6fb1a18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,7 @@
 .Rhistory
 .RData
 .Ruserdata
-*.Rproj
\ No newline at end of file
+*.Rproj
+# OS X stuff - https://gist.github.com/adamgit/3786883
+.DS_Store
+.Trashes
\ No newline at end of file
diff --git a/template.md b/template.md
index 3a6c371..46c6992 100644
--- a/template.md
+++ b/template.md
@@ -8,6 +8,7 @@ Things you should touch:
 
 | Item        | Description  |
 | --- | --- |
+| **.gitignore** | A place to tell git what _not_ to synchronise e.g. `.csv` or [weird OS files](https://gist.github.com/adamgit/3786883)|
 | **env.R**  | Where we store all the parameters that might be re-used across our repo. Such as colour defaults, data paths etc. We avoid using a project/repo level .Rprofile because it can lead to [a **lot** of confusion](https://support.rstudio.com/hc/en-us/articles/360047157094-Managing-R-with-Rprofile-Renviron-Rprofile-site-Renviron-site-rsession-conf-and-repos-conf). |
 | **DESCRIPTION** | But only if you use this as a tmeplate for your own repo - it is a special file for packages |
 | **LICENSE** | Edit to suit your needs |
@@ -27,3 +28,4 @@ Things you should not touch:
 | --- | --- |
 | **man/** | Created by building the project/package using roxygen2 |
 | **NAMESPACE** | - ditto - |
+| **.Rbuildignore** | - ditto - |
-- 
GitLab