Closed bernhardkaindl closed 2 years ago
Would you mind rebasing against master so that commits e77fdf8 and 8ba31e3 don't get double merged?
Done: Rebased #8 on new master and #4 on the rebased #8.
If you merge the rebased #8 using the "Rebase and merge" method of github (it's the 3rd of the 3 choices on how github can merge), you would not create a merge commit for #8 and it would be applied on master with no change, and then you can merge this #4 in one go without a need to rebase this one again on the otherwise created merge commit:
Ready to merge #8 by "Rebase and merge strategy, without creating a merge commit", and then #4 after this merge off #8.
And of course I always accept the github default of allowing project maintainers write access to the branch of the PR, so you can make any changes you want to the PR, including force-pushes with rebases.
And I can force-push the removal the commit for #8 from this PR, then you can merge #8 also with merge commit and this can be merged after it without rebase as the patch-context does not conflict.
@igo95862: Finished the rebase: It now only has a single commit on current master:
It is ready for merge now, as get_connections_by_id()
from #8 is merged too
@igo95862 This is also updated for
mypy --struct
andflake8
.I'd add the asyncio variant after the blocking variant passed review.