Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d6bfe99

Browse files
ksundenQuLogic
andauthored
Apply suggestions from code review
Co-authored-by: Elliott Sales de Andrade <[email protected]>
1 parent bc2f889 commit d6bfe99

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

doc/devel/release_guide.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ feature freeze (i.e. newly implemented features will be going into vX.Y+1).
3030
This does not necessarily mean that no further changes will be made prior to release,
3131
just that those changes will be made using the backport system.
3232

33-
First create the branch ::
33+
For an upcoming ``v3.7.0`` release, first create the branch::
3434

3535
git switch main
3636
git pull
@@ -440,7 +440,7 @@ notes, fixing broken links, and updating the version switcher) are bubbled up to
440440
``main``.
441441

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

0 commit comments

Comments
 (0)