Closed RojjaCebolla closed 2 years ago
I don't think any rebasing is necessary in this scenario, and rebasing should be avoided unless absolutely one hundred percent necessary. Rebasing is destructive to the history of a repository, and very dangerous.
@NullCGT Ah, ok - thought it might be alright for a not-merged PR. But i'll not do that, then!
Two of the fixes from #205 already got pushed to 1.0, which itself got merged into 1.1. So those two commits can be rebased out of the PR, and these two commits can be peeled out to be ready for a server version bump.
And that simplifies the ridicihuge PR a bit!