Add tip about merge over rebase #2144
Open
+2
−1
Conversation
This file contains hidden or 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
JMS55
approved these changes
Jun 3, 2025
janhohenheim
approved these changes
Jun 3, 2025
janhohenheim
added
the
S-Ready-For-Final-Review
|
My two cents: when a PR is still drafting, I tend to rebase it a bit, I think maybe limit this to things that are |
mockersf
reviewed
Jun 3, 2025
| @@ -86,7 +86,8 @@ If you're new to Bevy, here's the workflow we use: | |||
| * You can also use the CLI tool by installing [typos-cli](https://github.com/crate-ci/typos?tab=readme-ov-file#install) and running `typos` to check for typos, and fix them by running `typos -w`. | |||
| 8. Push your changes to your fork on GitHub and open a Pull Request. | |||
| 9. Respond to any CI failures or review feedback. While CI failures must be fixed before we can merge your PR, you do not need to *agree* with all feedback from your reviews, merely acknowledge that it was given. If you cannot come to an agreement, leave the thread open and defer to a Maintainer or the Project Lead's final judgement. | |||
| 10. When your PR is ready to merge, a Maintainer or the Project Lead will review it and suggest final changes. If those changes are minimal they may even apply them directly to speed up merging. | |||
| 10. When updating your PR branch, please avoid force pushing as it can disrupt GitHub notifications and make it harder for reviewers to track changes. Instead, merge the main branch into your feature branch when you need to resolve conflicts or update your PR. | |||
There was a problem hiding this comment.
I would prefer to propose the "good" solution first, and then the thing to avoid later. also, this should be as weakly worded as possible: git is not easy, people are free to use whatever they're confident using
There was a problem hiding this comment.
Roger that, let's reword.
alice-i-cecile
added
S-Waiting-On-Author
A-Contributing-Guide
and removed
S-Ready-For-Final-Review
|
I agree with Francois's comment above :) |
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.
After a quick discussion in discord, I decided to read through the contributing guidelines in Bevy and found there is no mention of rebase or merge, so I added this sentence!