Sync is failing #4861
Comments
|
cc @mrobinson |
mrobinson
added a commit
that referenced
this issue
Nov 18, 2024
Upstream sometimes uses merge commits which make it very difficult to maintain a cherry-pick based sync workflow. This change modifies the way syncing works so that it simply does a hard reset of the branch to the filtered repository. This should be more foolproof, with the downside that `main` is no longer up to date with upstream. Instead a new `upstream` branch is always up-to-date. Fixes #4861.
mrobinson
added a commit
that referenced
this issue
Dec 16, 2024
Upstream sometimes uses merge commits which make it very difficult to maintain a cherry-pick based sync workflow. This change modifies the way syncing works so that it simply does a hard reset of the branch to the filtered repository. This should be more foolproof, with the downside that `main` is no longer up to date with upstream. Instead a new `upstream` branch is always up-to-date. Fixes #4861.
mrobinson
added a commit
that referenced
this issue
Dec 16, 2024
Upstream sometimes uses merge commits which make it very difficult to maintain a cherry-pick based sync workflow. This change modifies the way syncing works so that it simply does a hard reset of the branch to the filtered repository. This should be more foolproof, with the downside that `main` is no longer up to date with upstream. Instead a new `upstream` branch is always up-to-date. Fixes #4861.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
first failed run: https://github.com/servo/webrender/actions/runs/11088080481/job/30807519020#step:4:1099
The text was updated successfully, but these errors were encountered: