You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
@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?
The text was updated successfully, but these errors were encountered:
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.
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?
The text was updated successfully, but these errors were encountered: