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 code to work with Dioxus 0.6.1 #6

Merged
merged 3 commits into from
Jan 5, 2025

Conversation

jprider63
Copy link
Contributor

This builds on top of @gtrak's commit here.

@autarch
Copy link
Member

autarch commented Jan 2, 2025

Hi, thanks for your PR! I'm pretty finicky about my projects (see this blog post for details), so I rarely merge a PR as-is. I can move forward on your PR in one of two ways:

  1. I check it out locally, fiddle with it as needed, merge it locally, and simply close this PR. This will preserve at least one commit with your name on it, but the PR will show up as closed in your GitHub stats.
  2. If you enable me to push directly to your PR branch (which is the default when you make a PR), I can do my fiddling, then force push to your PR branch and merge the resulting PR. Again, this will preserve at least one commit with your name on it, but you also get credit for the PR merge in your GitHub stats. The only downside is that I will be force pushing directly to your PR branch. Note that this will not work if the PR branch is named master. GitHub doesn't allow me to push to the default branch of your fork.

Please let me know which approach you'd prefer. If I don't hear from you before I get around to working on this PR I'll go with option 1.

Thanks again for your contribution!

@autarch
Copy link
Member

autarch commented Jan 2, 2025

Sorry for the conflicts. I realized that CI was totally broken so I fixed that in master.

@jprider63 jprider63 force-pushed the 0.6.1 branch 2 times, most recently from 454275f to 8b8576e Compare January 3, 2025 05:15
@jprider63
Copy link
Contributor Author

Hi, thanks for your PR! I'm pretty finicky about my projects (see this blog post for details), so I rarely merge a PR as-is. I can move forward on your PR in one of two ways:

1. I check it out locally, fiddle with it as needed, merge it locally, and simply close this PR. This will preserve at least one commit with your name on it, but the PR will show up as closed in your GitHub stats.

2. If you enable me to push directly to your PR branch (which is the default when you make a PR), I can do my fiddling, then force push to your PR branch and merge the resulting PR. Again, this will preserve at least one commit with your name on it, but you _also_ get credit for the PR merge in your GitHub stats. The only downside is that I will be force pushing directly to your PR branch. **Note that this will not work if the PR branch is named `master`. GitHub doesn't allow me to push to the default branch of your fork.**

Please let me know which approach you'd prefer. If I don't hear from you before I get around to working on this PR I'll go with option 1.

Thanks again for your contribution!

I'm fine with either option.

I started rebasing, but ran into conflicts. I probably won't get to this for a bit so feel free to rebase or I'll get to it when I can.

@autarch autarch changed the title Update to dioxus 0.6.1 Update code to work with Dioxus 0.6.1 Jan 5, 2025
@autarch autarch merged commit 9c73d63 into houseabsolute:master Jan 5, 2025
17 checks passed
@autarch
Copy link
Member

autarch commented Jan 5, 2025

Thanks for this. I got this updated to work with my recent changes and released version 0.4.0 of this crate.

@jprider63
Copy link
Contributor Author

Sounds good, thanks!

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

Successfully merging this pull request may close these issues.

2 participants