feat: use rebase when syncing changes from mirror/main back to fork #379
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
riley-kohler
approved these changes
Jul 30, 2025
Contributor
riley-kohler
left a comment
There was a problem hiding this comment.
Looks good, thanks for your work here!
9250e0f
into
github-community-projects:main
11 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Pull Request
This PR changes the repo sync logic. Instead of using merge, it will now use rebase.
Proposed Changes
#368 addresses the bugs that arise from using merges and the need for rebases.
Readiness Checklist
Author/Contributor
npm run lintand fix any linting issues that have been introducednpm run testand run tests@jeffrey-luszczReviewer
bug,documentation,enhancement,infrastructure,maintenance, orbreaking