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.

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

Update canary-base to remove stale commits #148

Closed
mmarchini opened this issue Mar 4, 2020 · 6 comments
Closed

Update canary-base to remove stale commits #148

mmarchini opened this issue Mar 4, 2020 · 6 comments

Comments

@mmarchini
Copy link

What's the process to update canary-base? Should I just force-push there, or is there a better way?

@targos
Copy link
Member

targos commented Mar 5, 2020

Force push is the way

@mmarchini
Copy link
Author

Ok, will do tomorrow :)

@gengjiawen
Copy link
Member

Force push is the way

Not sure code merge strategy in this repo. Can you merge #147 before force update ? @targos

@mmarchini
Copy link
Author

Will update canary-base tomorrow, it's late and I'll probably make a mistake if I rebase it now.

@mmarchini
Copy link
Author

In the end I didn't rebase it today because there was still some legitimate failures on the PR (and I wanted to avoid rebasing multiple times). I think now things are more stable (let's see the results from the last CI), so tomorrow I'll do it.

@mmarchini
Copy link
Author

Rebased and force-pushed. I couldn't cherry-pick #147 (conflict, will cherry-pick next week) and #149 (failing test). I cherry-picked #150, otherwise canary-base wouldn't build.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants