Skip to content

Commit aeea376

Browse files
authored
Merge branch 'main' into release-v0.2
2 parents e6d2d4e + a6c4dba commit aeea376

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,18 @@ In all data subfolders, FDS input files as well as a run script `case_run.sh` is
5050

5151
The `case_download.sh` script inside the individual data subfolders can be used to download precomputed data.
5252

53+
## Contribution
54+
55+
### For external
56+
57+
Please for the `development` branch and create a pull request based on that.
58+
59+
### For internal
60+
61+
**New section / content**: Create a feature branch of `development`. Once finished, merge it back and create a release branch with your changes that have to be pushed to `main`. Assign Lukas as reviewer for the pull request.
62+
63+
**Typos / Fixes**: Push them directly to the `development` branch and then directly to `main`.
64+
5365
## License
5466

5567
This work is licensed under a
@@ -59,4 +71,4 @@ This work is licensed under a
5971

6072
[cc-by-sa]: http://creativecommons.org/licenses/by-sa/4.0/
6173
[cc-by-sa-image]: https://licensebuttons.net/l/by-sa/4.0/88x31.png
62-
[cc-by-sa-shield]: https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg
74+
[cc-by-sa-shield]: https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg

book/_toc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@
5555
- file: content/tools/02_hpc/02_hpc
5656
# - file: content/tools/02_hpc/03_parallel_fds
5757

58+

0 commit comments

Comments
 (0)