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

Current PRs state #43

Open
tg44 opened this issue Feb 5, 2024 · 2 comments
Open

Current PRs state #43

tg44 opened this issue Feb 5, 2024 · 2 comments

Comments

@tg44
Copy link
Owner

tg44 commented Feb 5, 2024

Hy there!

@hyperair and @loelkes You two have open PRs right now. As I see #34 is a big changeset, and I want to merge it, it also conflicting right now. So I would like to get a rebase+forcepush on that, so I can merge it.

The other two PRs (#41 and #42 ) are quite small, if I merge the huge one, we should rebase/redo them and merge them separately.

Is this ok for you two?

@hyperair
Copy link
Contributor

hyperair commented Feb 5, 2024

yep no problem

@loelkes
Copy link
Contributor

loelkes commented Feb 11, 2024

I've already merged `main' into my branch, so there shouldn't be any conflicts. I could also merge #41 and #42 directly into my branch, and add a feature to specify the timeout reset delay in the GUI configuration, rather than having a hard-coded value there.

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

No branches or pull requests

3 participants