Skip to content

Commit

Permalink
improve release process order: do version bump in branch and merge to…
Browse files Browse the repository at this point in the history
… main last
  • Loading branch information
xflr6 committed Mar 21, 2024
1 parent 43638ee commit b820426
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions docs/release_process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,6 @@ If changes are needed (and go back to: **Cleanup** step):
$ git commit --amend --date=now
Switch to main branch and merge ``release``:

.. code:: bash
$ git switch master
$ git merge --ff-only release
**Tag** with annotated release version tag:

.. code:: bash
Expand All @@ -101,12 +94,19 @@ Document post-release:

- add new ``Version $MAJOR.$MINOR[.$BUGFIX] (in development)`` heading to ``CHANGES.rst``

Commit version bump to main branch:
Commit version bump to ``relase`` branch:

.. code:: bash
$ git commit -m "bump version for development"
Switch to main branch and merge ``release``:

.. code:: bash
$ git switch master
$ git merge --ff-only release
Publish
-------
Expand Down

0 comments on commit b820426

Please sign in to comment.