[jfx24] RFR: Merge ecec2645a99a9c1343ddf08c4009df578d5b2165 [v2]
Kevin Rushforth
kcr at openjdk.org
Tue Jan 21 16:14:43 UTC 2025
On Tue, 21 Jan 2025 15:57:12 GMT, Andy Goryachev <angorya at openjdk.org> wrote:
> > I messed up the target branch
>
> please also force push the master branch.
No. This PR has been intentionally retargeted to `jfx24` branch. It now has nothing to do with `master`.
> (I guess this merge was the reason github greeted me with the label "11 commits behind" message this morning)
The merge of #1681 into master was the reason. Intentionally so.
To add a little more explanation: as happens every January and July, any CPU content must be merged into both to `master` and to the then-current stabilization branch (`jfx24` for this January 2025 CPU release). My only mistake is that I targeted both PRs to `master` when one of them should have been to `jfx24`. Since the source branches were 100% identical, the mistake was easiest to fix by retargeting this one to `jfx24`, which I did. I'll integrate this PR to jfx24 after everything else related to the CPU is finished.
-------------
PR Comment: https://git.openjdk.org/jfx/pull/1680#issuecomment-2605161568
More information about the openjfx-dev
mailing list