godotengine/godot-docs
1
0
Fork 0
mirror of https://github.com/godotengine/godot-docs.git synced 2026-01-03 05:48:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor errors on PR workflow page (#5762)

Browse Source
This commit is contained in:
Eduardo Rodrigues
2022-04-12 19:43:29 -03:00
committed by GitHub
parent e2a22b06f7
commit 633aa81a3e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
community/contributing/pr_workflow.rst
View File

@@ -59,7 +59,7 @@ The branches on the Git repository are organized as follows:
They are used to backport bugfixes and enhancements from the ``master``
branch to the currently maintained stable release (e.g. 3.1.2 or 2.1.6).
As a rule of thumb, the last stable branch is maintained until the next
major version (e.g. the ``3.0`` branch was maintained until the release of
minor version (e.g. the ``3.0`` branch was maintained until the release of
Godot 3.1).
If you want to make PRs against a maintained stable branch, please check
first if your changes are also relevant for the ``master`` branch, and if so
@@ -449,7 +449,7 @@ the so-called ``HEAD``.
While you can give any commit ID to ``git rebase -i`` and review everything in
between, the most common and convenient workflow involves rebasing on the
*upstream ``master`` branch*, which you can do with:
upstream ``master`` branch, which you can do with:
::