Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync is failing #4861

Open
sagudev opened this issue Oct 13, 2024 · 1 comment · May be fixed by #4864
Open

Sync is failing #4861

sagudev opened this issue Oct 13, 2024 · 1 comment · May be fixed by #4864

Comments

@sagudev
Copy link
Member

sagudev commented Oct 13, 2024

first failed run: https://github.com/servo/webrender/actions/runs/11088080481/job/30807519020#step:4:1099
@sagudev
Copy link
Member Author

sagudev commented Oct 20, 2024

cc @mrobinson

mrobinson added a commit that referenced this issue Nov 18, 2024
@mrobinson
Sync only to the upstream branch and do not cherry-pick
7166097 
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 mrobinson linked a pull request Nov 18, 2024 that will close this issue
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Sync only to the upstream branch and do not cherry-pick servo/webrender
1 participant
@sagudev