Skip to content

Commit

Permalink
Merge pull request #94 from DataONEorg/develop
Browse files Browse the repository at this point in the history
Merge develop onto main

- Adds v1.0.0 of MOSAiC ontology
- Updates contributing guidelines to indicate new policy requiring only one approver of PRs onto main
  • Loading branch information
amoeba authored Aug 11, 2021
2 parents 2963b6e + 0f9b7bd commit 26c45df
Show file tree
Hide file tree
Showing 4 changed files with 267,461 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ into several branches, each with a specific purpose.
reflects the current releases for each ontology. Changes should not occur
directly on the main branch, but rather be merged from `develop` using a Pull
Request once a new release has been fully vetted. Thus, the `main` branch is
locked and requires formal review and approval from two project members before
locked and requires formal review and approval from one project member before
the release pull request can be merged. Once a PR from `develop` has been
merged, a tag should be immediately created reflecting the version released.
These tags should be of the form `NAME-version`, where NAME is the abbreviated
Expand Down
Loading

0 comments on commit 26c45df

Please sign in to comment.