Closed csantanapr closed 3 years ago
@csantanapr something odd is going on? -> it looks like you picked up an outdated OWNERS file (which is why the Bot/linter is blocking this).
When im doing this sync and something funny happens, I try a HARD reset (since the staging
branch is a literal copy of whats in main
). For example:
git checkout staging
git reset --hard upstream/main
git pull upstream main
git push origin staging
@RichieEscarez I already tried what you suggested and push but it looks like there are conflicts because us a reset of the branch, not sure how you handle this in PRs other than replace the branch with the main branch content
I know what's going on we have merge a PR to update OWNER_ALIASES in main https://github.com/knative/website/pull/300
@RichieEscarez OK I think I got it fixed now
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: RichieEscarez
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/assign @RichieEscarez