Merge pull request #62 from OxfordIHTM:dev

edit chapter 8
OxfordIHTM · Sep 6, 2024 · 92245e0 · 92245e0
2 parents 7a3eef7 + 0a3b5d8
commit 92245e0
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 31 deletions.
diff --git a/08-participating-rstudio-project.qmd b/08-participating-rstudio-project.qmd
@@ -9,37 +9,10 @@ Following are the general steps to take when participating in an existing R/RStu
 The following diagram illustrates the steps in this process:
 
 ```{mermaid}
-%%| fig.caption: A flowchart of a git-based development workflow
-%%| fig.align: center
-
-flowchart TB
-  clone(clone)
-  branch(branch)
-  changes("Code/make\nchanges")
-  commit(commit)
-  push(push)
-  pr(pull\nreqest)
-  merge(merge)
-
-  review{ready\nfor\nreview?}
-  approve{changes\napproved?}
-  task{new\ntask?}
-
-
-  clone --> branch --> changes 
-  changes --> commit --> push 
-  push --> review 
-  pr --> approve
-  merge --> task
-
-  review -- YES --> pr
-  review -- NO --> changes
-
-  approve -- YES --> merge
-  approve -- NO--> changes
-
-  task -- YES --> branch
-  task -- NO --> changes
+%%| label: git-workflow
+%%| fig-cap: A flowchart of a git-based development workflow
+%%| fig-align: center
+%%| file: mermaid/git-workflow.mmd
 ```
 
 ## Clone the project to your local machine

diff --git a/mermaid/git-workflow.mmd b/mermaid/git-workflow.mmd
@@ -0,0 +1,28 @@
+flowchart TB
+  clone(clone)
+  branch(branch)
+  changes("Code/make\nchanges")
+  commit(commit)
+  push(push)
+  pr(pull\nreqest)
+  merge(merge)
+
+  review{ready\nfor\nreview?}
+  approve{changes\napproved?}
+  task{new\ntask?}
+
+
+  clone --> branch --> changes 
+  changes --> commit --> push 
+  push --> review 
+  pr --> approve
+  merge --> task
+
+  review -- YES --> pr
+  review -- NO --> changes
+
+  approve -- YES --> merge
+  approve -- NO--> changes
+
+  task -- YES --> branch
+  task -- NO --> changes