Skip to content
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

Jump to bottom

contributing: Align backporting example with text #2978

Merged
merged 4 commits into from
Feb 15, 2024
Merged

contributing: Align backporting example with text #2978

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7618656
grass.spec: update to latest grass.spec from Fedora git
neteler May 17, 2023
e837718
contributing: Align backporting example with text
wenzeslaus May 23, 2023
1de9189
Revert "grass.spec: update to latest grass.spec from Fedora git"
wenzeslaus May 23, 2023
d853004
Modify the example to order releae branches by closeness to main not …
wenzeslaus Feb 14, 2024
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
10 changes: 5 additions & 5 deletions doc/development/submitting/general.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ available), and compilation of the whole source tree (ideally after the
the original commit to "main". Also note that not all these steps have to be
done manually, you can take an advantage of our [​CI](https://github.com/OSGeo/grass/actions).

Often there is more than one active release branch, if you are backporting, make
sure you always backport to all the branches between "main" and the furthest
branch you are backporting to. For example, let's say we have "main" and branches
8.2 and 7.8, if you backport to 8.2, you should also consider to backport to 7.8.
You can also choose to backport only to the closest branch, in our example 8.2.
Often there is more than one active release branch. You can also choose to backport
only to the closest branch. If you are backporting to other release branches than
just the closets one, make sure you always backport to all the branches between "main"
and the furthest branch you are backporting to. For example, let's say we have
release branches 3.6 and 3.5, if you backport to 3.5, you should backport to 3.6, too.

Backport only complete fixes. When you are not sure if the fix is complete or if
there is an possibility that some details such as wording will change, wait with
Expand Down
Loading