-
Notifications
You must be signed in to change notification settings - Fork 84
Fix merge conflict section in walkthrough #11
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
Fix merge conflict section in walkthrough #11
Conversation
There is a merge conflict at section of "Adding the framework into our types" This PR fix conflict by following current contents of pkg/apis/addons/v1alpha1/dashboard_types.go
|
Thank you! /assign @justinsb |
|
Awesome - thanks for fixing @atoato88 /ok-to-test |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: atoato88, justinsb 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 |
|
@BenTheElder - is there something else we need to do here to kick off Prow? |
|
/test pull-declarative-test |
|
ah we need to enable the trigger plugin https://prow.k8s.io/plugins?repo=kubernetes-sigs%2Fkubebuilder-declarative-pattern |
|
/test pull-declarative-test |
|
This is a real failure (but in HEAD, not from this change). #12 should fix. |
|
/test pull-declarative-test |
|
Thanks for the fix and patience @atoato88 |
There is a merge conflict at section of "Adding the framework into our types" in docs/addon/walkthrough/README.md
This PR fix conflict by following current contents of pkg/apis/addons/v1alpha1/dashboard_types.go