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

Apply editorial updates from Alex's old PR #939

Merged
merged 1 commit into from
Jul 8, 2024

Conversation

jillian-maroket
Copy link
Contributor

Which issue(s) this PR fixes:

See PR 856.

What this PR does / why we need it:

Changes from PR 856 must be applied to all other active versions.

Copy link

netlify bot commented Jul 7, 2024

Deploy Preview for longhornio ready!

Name Link
🔨 Latest commit 30e7500
🔍 Latest deploy log https://app.netlify.com/sites/longhornio/deploys/668b5bb4c07cc70008c468c3
😎 Deploy Preview https://deploy-preview-939--longhornio.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@derekbit
Copy link
Member

derekbit commented Jul 7, 2024

@jillian-maroket need to resolve conflicts before merging it, thanks.

@jillian-maroket
Copy link
Contributor Author

@derekbit I don't know why those commits are included in this PR and why the codespell issues exist. The problematic commits are from PR 914 and the codespell issues were fixed in PR 912.

How should I proceed?

derekbit
derekbit previously approved these changes Jul 8, 2024
@derekbit
Copy link
Member

derekbit commented Jul 8, 2024

@derekbit I don't know why those commits are included in this PR and why the codespell issues exist. The problematic commits are from PR 914 and the codespell issues were fixed in PR 912.

How should I proceed?

No worries. I helped rebase your PR.
Remember to pull rebase it to prevent conflicts next time. Thank you.

@derekbit
Copy link
Member

derekbit commented Jul 8, 2024

@jillian-maroket The commit is not signed. Please help sign it. Thank you.

@jillian-maroket
Copy link
Contributor Author

I just manually approved the commit sign-off again. As mentioned in our chat, I did that after creating the PR but it disappeared.

Anyway, thanks for helping rebase the PR. I made sure to pull before creating the branch to avoid conflicts but somehow unrelated commits still appeared. I'll try rebasing and force-pushing next time.

@derekbit derekbit merged commit 7e7adfb into longhorn:master Jul 8, 2024
6 checks passed
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

Successfully merging this pull request may close these issues.

2 participants