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

Just the fixes #222

Merged
merged 2 commits into from
Oct 30, 2021
Merged

Just the fixes #222

merged 2 commits into from
Oct 30, 2021

Conversation

RojjaCebolla
Copy link
Collaborator

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!

@NullCGT
Copy link
Owner

NullCGT commented Oct 30, 2021

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 NullCGT merged commit 7118343 into Spl-R-1.1.0 Oct 30, 2021
@RojjaCebolla
Copy link
Collaborator Author

@NullCGT Ah, ok - thought it might be alright for a not-merged PR. But i'll not do that, then!

@RojjaCebolla RojjaCebolla deleted the justTheFixes branch October 30, 2021 15:25
@RojjaCebolla RojjaCebolla mentioned this pull request Dec 11, 2021
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

Successfully merging this pull request may close these issues.

2 participants