Skip to content

Commit

Permalink
Update 02-FIMS-Project-Overview.Rmd
Browse files Browse the repository at this point in the history
add in mermaid diagram suggesting M2 workflow
  • Loading branch information
ChristineStawitz-NOAA authored Apr 11, 2024
1 parent c8102c4 commit 5840b0b
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions 02-FIMS-Project-Overview.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,19 @@ from either the "In Review" or "Response" state.
```{r flowchart, echo = FALSE, out.width='75%', fig.cap="Flow chart that describes above process visually, e.g. how an issue moves from creation, to activation, to response or resolution, and is finally closed."}
knitr::include_graphics("New Flowchart.png")
```
### M2 development workflow

```mermaid
flowchart TD
A[main] -->B[development];
A -- R interface group --> C[short-lived feature branch];
A -- Documentation group --> C[short-lived feature branch];
A -- NLL group --> E[development branch];
A -- More features group --> F[development branch];
F ---> G[short-lived feature branch];
C ----> H[Merge into main];
G --> H;
```

### Feature validation

Expand Down

1 comment on commit 5840b0b

@ChristineStawitz-NOAA
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Andrea-Havron-NOAA let me know if this is in line with what you were thinking for M2 workflow

Please sign in to comment.