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.

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

contributing: Align backporting example with text #2978

Merged
merged 4 commits into from
Feb 15, 2024

Conversation

wenzeslaus
Copy link
Member

@wenzeslaus wenzeslaus commented May 23, 2023

The first part of the paragraph talks about backporting to all branches in between main and furthest backport. However, the example pushed the idea of backport to the furthest instead. The new example is now only about backporting to the in-between branch while the paragraph addresses the backport in general and packport to the closest branch first.

The new example uses version numbers with the major version 3 because it is only an example, so it does not need to be updated.

neteler and others added 2 commits May 23, 2023 11:17
The first part of the paragraph talks about backporting to all branches in between main and furthest backport. However, the example pushed the idea of backport to the furthest instead. The new example is now only about backporting to the in-between branch.

The new example uses version numbers with the major version 3 because it is only an example, so it does not need to be updated.
@neteler
Copy link
Member

neteler commented May 23, 2023

grass.spec: update to latest grass.spec from Fedora git

I guess this should be in a separate PR.

@wenzeslaus
Copy link
Member Author

I guess this should be in a separate PR.

An in fact it is: #2977. I must have used that branch instead of main to create this one branch. I'll just revert that commit.

@wenzeslaus wenzeslaus changed the title modify backporting guideline contributing: Align backporting example with text May 23, 2023
@wenzeslaus wenzeslaus added the enhancement New feature or request label May 23, 2023
@wenzeslaus
Copy link
Member Author

Reverted and the description updated accordingly.

@neteler neteler added this to the 8.4.0 milestone Aug 16, 2023
…thier number and simplify the example by addressing the default choice at the beginning of the pragraph
@github-actions github-actions bot added the docs label Feb 14, 2024
@wenzeslaus wenzeslaus enabled auto-merge (squash) February 14, 2024 16:52
@wenzeslaus
Copy link
Member Author

This is ready for review. (The conversation can be resolved, too.)

Copy link
Member

@neteler neteler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@wenzeslaus wenzeslaus merged commit bc850a0 into OSGeo:main Feb 15, 2024
22 checks passed
@wenzeslaus wenzeslaus deleted the modify-backporting-guideline branch February 15, 2024 08:44
jadenabrams100 pushed a commit to ncsu-csc472-spring2024/grass-CI-playground that referenced this pull request Feb 21, 2024
The first part of the paragraph talks about backporting to all branches in between main and furthest backport. However, the example pushed the idea of backport to the furthest instead. The new example is now only about backporting to the in-between branch while the paragraph addresses the backport in general and packport to the closest branch first.

The new example uses version numbers with the major version 3 because it is only an example, so it does not need to be updated.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants