Skip to content

Update release guide instructions post v3.7.0 #25235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QuLogic merged 6 commits into from
Mar 15, 2023
Merged

Update release guide instructions post v3.7.0 #25235

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
493d5bd
Update release guide instructions post v3.7.0
ksunden Feb 16, 2023
7ee5fa7
Reorder release branch creation and include merge up procedure
ksunden Feb 22, 2023
42dcd32
Add UAT for notebook backends, remove contact numfocus
ksunden Feb 24, 2023
b50cc04
Spelling and grammar fixes
ksunden Mar 3, 2023
bc2f889
Update announcement docs
ksunden Mar 3, 2023
d6bfe99
Apply suggestions from code review
ksunden Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Apply suggestions from code review 
Co-authored-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  • Loading branch information
@ksunden @QuLogic
ksunden and QuLogic authored Mar 13, 2023
commit d6bfe99e018d66c2d2c053b036aa1e2e031be2a8
4 changes: 2 additions & 2 deletions doc/devel/release_guide.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ feature freeze (i.e. newly implemented features will be going into vX.Y+1).
This does not necessarily mean that no further changes will be made prior to release,
just that those changes will be made using the backport system.

First create the branch ::
For an upcoming ``v3.7.0`` release, first create the branch::

git switch main
git pull
Expand Down Expand Up @@ -440,7 +440,7 @@ notes, fixing broken links, and updating the version switcher) are bubbled up to
``main``.

Git conflicts are very likely to arise, though aside from changes made directly to the
release branch (mostly as part of the release), they should be relatively trivially resolved
release branch (mostly as part of the release), they should be relatively-easily resolved
by using the version from ``main``. This is not a universal rule, and care should be
taken to ensure correctness::

Expand Down