Update contributing policy #525
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Ian Chen <[email protected]>
peci1
suggested changes
Oct 15, 2024
contributing.md
Outdated
| # Fix conflicts | ||
| git commit -sam"Backport from N to M" | ||
| # Open pull request | ||
| # Do not squash, rebase instead | ||
| * Periodically, a maintainer will **forward-port** changes to newer release |
There was a problem hiding this comment.
What about here? Isn't it now bidirectional, or mostly back-port way?
There was a problem hiding this comment.
Eventually, I think it will be mostly back-ports, but right now we have a mix of both. But I agree this sentence could be updated to indicate back-ports are now more likely.
There was a problem hiding this comment.
updated sentence so that forward port does not sound like a periodic thing we do 4724943
azeey
reviewed
Oct 15, 2024
contributing.md
Outdated
| # Fix conflicts | ||
| git commit -sam"Backport from N to M" | ||
| # Open pull request | ||
| # Do not squash, rebase instead | ||
| * Periodically, a maintainer will **forward-port** changes to newer release |
There was a problem hiding this comment.
Eventually, I think it will be mostly back-ports, but right now we have a mix of both. But I agree this sentence could be updated to indicate back-ports are now more likely.
azeey
approved these changes
Oct 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🦟 Bug fix
Summary
Updated to reflect the new policy introduced in https://community.gazebosim.org/t/gazebo-policy-update-new-backporting-policy/2880.
Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.