Skip to content

Commit

Permalink
Docs: dev-centered development (openPMD#928)
Browse files Browse the repository at this point in the history
We only use a `dev` branch for all development and occationally open
`release-X.Y.Z` branches to backport features to prior releases.
  • Loading branch information
ax3l authored Feb 11, 2021
1 parent d8ccade commit d97adf8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ For existing tasks, the labels `good first issue <https://github.com/openPMD/ope
In case you want to start working on one of those, just *comment* in it first so no work is duplicated.

New contributions in form of `pull requests <https://help.github.com/articles/about-pull-requests/>`_ always need to go in the ``dev`` (development) branch.
The ``master`` branch contains the last stable release and receives updates only when a new version is drafted.

Maintainers organize prioritites and progress in the `projects tab <https://github.com/openPMD/openPMD-api/projects>`_.

Expand Down
1 change: 0 additions & 1 deletion docs/source/dev/repostructure.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Repository Structure
Branches
--------

* ``master``: the latest stable release, always tagged with a version
* ``dev``: the development branch where all features start from and are merged to
* ``release-X.Y.Z``: release candidate for version ``X.Y.Z`` with an upcoming release, receives updates for bug fixes and documentation such as change logs but usually no new features

Expand Down

0 comments on commit d97adf8

Please sign in to comment.