-
Notifications
You must be signed in to change notification settings - Fork 71
Add a more robust script for automating the upstream/downstream sync process #351
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
Add a more robust script for automating the upstream/downstream sync process #351
Conversation
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: timflannagan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
49bc58d
to
48c3362
Compare
…mmits.sh Signed-off-by: timflannagan <[email protected]>
… left Signed-off-by: timflannagan <[email protected]>
48c3362
to
f79a4f0
Compare
Signed-off-by: timflannagan <[email protected]>
… process Signed-off-by: timflannagan <[email protected]>
81cb3e3
to
8a80bf9
Compare
Signed-off-by: timflannagan <[email protected]>
@timflannagan: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
/lgtm |
Introduces a scripts/sync.sh bash script that attempts to automate the upstream/downstream sync process locally. Updates the sync_pop_candidates.sh bash script logic, and adds some "smarter" logic for handling common merge conflicts and trying to hack around them. Follow-up work may run this logic in a prowjob periodic and automatically open a PR under a bot account when new commits have been detected.