Force rebase on sync #81
Merged
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
bentsku
approved these changes
Dec 15, 2025
bentsku
left a comment
bentsku
left a comment
There was a problem hiding this comment.
LGTM, this seems like a sensible change 👍 it allows us to add more commits to moto-ext without having the dependency on more things being merged upstream
localstack-bot
pushed a commit
that referenced
this pull request
Dec 22, 2025
localstack-bot
pushed a commit
that referenced
this pull request
Dec 29, 2025
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.
The current version of the Sync & Release action does not work when there are no upstream changes between our latest post release and now.
The reason for that is that the rebase is skipped in case
upstream/mastercontains no changes compared to what we have in this fork. However, that rebase is necessary to get rid of the latestpostXYrelease in the current tree. A rebase would replace it with new commits based on the new upstream. If it's still theresetuptools_scmwill consider it the latest version tag and then build the new post release based off of it, sopostXY.post1.To avoid this, we can force the rebase to always happen, even if there were no changes upstream.