Test: enable destination rebase for copybara webdev sync#515
Closed
coreymartin wants to merge 1 commit intomainfrom
Closed
Test: enable destination rebase for copybara webdev sync#515coreymartin wants to merge 1 commit intomainfrom
coreymartin wants to merge 1 commit intomainfrom
Conversation
Remove --nogit-destination-rebase so copybara rebases the sync commit onto current webdev main. This was originally disabled due to merge conflicts, but those may have been from a one-time issue. If the rebase succeeds, it eliminates the stale PR branch problem entirely. Also temporarily enables the create-webdev-pr job on PRs (not just push to main) so we can test the copybara flow without merging to main. The "Reset develop to main" step is gated to push-only to avoid destructive side effects on PR runs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Contributor
Author
|
Confirmed: destination rebase causes conflicts in |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
--nogit-destination-rebaseflag from the copybara sync to webdevcreate-webdev-prjob on PRs so we can test the copybara flow without merging to mainContext
The
--nogit-destination-rebaseflag was originally added to avoid merge conflicts when copybara rebases onto webdev main. However, the conflicts were likely from CHANGELOG files, which only change in the public repo — so there shouldn't actually be conflicts during rebase.Without this flag, copybara automatically rebases the sync commit onto current webdev main, which eliminates the stale PR branch problem we've been hitting (see lightsparkdev/webdev#25478).
Test plan
create-webdev-prjob run🤖 Generated with Claude Code