Skip to content

512 Byte Fix Last PR - #5126

Merged
leijurv merged 2 commits into
cabaletta:1.21.4from
GPSolo:512ByteFix
Sep 18, 2026
Merged

leijurv merged 2 commits into
cabaletta:1.21.4from
GPSolo:512ByteFix

Conversation

@GPSolo

@GPSolo GPSolo commented Sep 16, 2026

Copy link
Copy Markdown
Contributor

This is only one line, fr this time.

@AverWasTaken

AverWasTaken commented Sep 16, 2026

Copy link
Copy Markdown
Contributor

All prs should target the 1.21.4 branch, they will be merged to later versions by other people.

@GPSolo
GPSolo changed the base branch from 26.2 to 1.21.4 September 16, 2026 23:13
@AverWasTaken

Copy link
Copy Markdown
Contributor

???
image

@GPSolo

GPSolo commented Sep 17, 2026

Copy link
Copy Markdown
Contributor Author

All prs should target the 1.21.4 branch, they will be merged to later versions by other people.

You told me to do this.

@GPSolo
GPSolo changed the base branch from 1.21.4 to 26.2 September 17, 2026 04:31
@ZacSharp

ZacSharp commented Sep 17, 2026

Copy link
Copy Markdown
Collaborator

Youe commit was made on the 26.2 branch, so just changing the target branch to 1.21.4 means the pr includes all commits made on the 1.21.5+ branches. The correct thing to do is to rebase your branch to instead be based on the 1.21.4 branch and then change the target branch.

Originally I wanted to just force push to this pr to do that fix myself, but me force pushing to your pr means your local branch and the one on GitHub go out of sync in a way that plain git pull or git push cannot fix. You do not seem to be all that familiar with git or pull requests, so maybe I better not do that.

@GPSolo

GPSolo commented Sep 17, 2026

Copy link
Copy Markdown
Contributor Author

This is getting ridiculous, it is literally one line. Can we not just commit it separately we don't really need a PR for this ATP

@GPSolo
GPSolo changed the base branch from 26.2 to 1.21.4 September 17, 2026 18:47
@GPSolo

GPSolo commented Sep 17, 2026

Copy link
Copy Markdown
Contributor Author

Rebased to branch 1.21.4

@ZacSharp ZacSharp left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless #5117 is cancelled for some reason there won't be a release with this fix but without the rewrite.

But this does fix a bug and is a mergeable pr.

@GPSolo

GPSolo commented Sep 18, 2026

Copy link
Copy Markdown
Contributor Author

Okay, thank you for dealing with the confusion/mistakes

@leijurv
leijurv merged commit e45e2b7 into cabaletta:1.21.4 Sep 18, 2026
1 of 2 checks passed
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.

4 participants