diff --git a/08-participating-rstudio-project.qmd b/08-participating-rstudio-project.qmd index 63299ce..b8eb529 100644 --- 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 new file mode 100644 index 0000000..85a135d --- /dev/null +++ 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 \ No newline at end of file