Skip to content
Snippets Groups Projects
Commit 4684626c authored by Martyn Gigg's avatar Martyn Gigg
Browse files

Use branch name release-next everywhere in dev-docs

Refs #0
parent 194cf42b
No related branches found
No related tags found
No related merge requests found
......@@ -147,10 +147,10 @@ changes:
Pull Requests
-------------
Open pull requests as normal to ask to merge your branch with its
intended target.
To merge code with the release branch open a pull request as usual but instead of using the
default merge target select ``release-next``:
.. image:: images/CodeFreezePR.png
.. image:: images/release-branch-new-pr.png
Fixing a PR with an Incorrect Base Branch
-----------------------------------------
......@@ -167,14 +167,14 @@ been based off the ``master`` branch as follows::
| \
| o---o---o topic
\
o---o---o---o---o release
o---o---o---o---o release-next
where we actually want the ``topic`` branch based off ``release``
where we actually want the ``topic`` branch based off ``release-next``
instead i.e. ::
o---o---o---o---o master
\
o---o---o---o---o release
o---o---o---o---o release-next
\
o'---o'---o' topic
......
dev-docs/source/images/CodeFreezePR.png

95.6 KiB

dev-docs/source/images/release-branch-new-pr.png

77.5 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment